|
|
|
@ -847,7 +847,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
|
|
|
|
|
mesWorkOrderService.doProductReportReversal(mesWorkOrderDb,productVersion, requestModel.getUserName());*/
|
|
|
|
|
//移库
|
|
|
|
|
requestModel.setSn(produceSnDb.getProductSn());
|
|
|
|
|
doCreateMove(requestModel,locateNo,productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo());
|
|
|
|
|
// doCreateMove(requestModel,locateNo,productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private MesProductVersion getProductVersion(MesWorkOrder mesWorkOrderDb) {
|
|
|
|
@ -869,7 +869,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
|
|
|
|
|
//对于已勾选报废的子件,对于有零件号的项,产生移库(产线的材料库位->报废库(系统参数配置))。移库数量为报废时的明细数量;
|
|
|
|
|
if(!StringUtils.isEmpty(assemblyModel.getAssemblyPartNo())){
|
|
|
|
|
//移库
|
|
|
|
|
doCreateMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName);
|
|
|
|
|
// doCreateMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName);
|
|
|
|
|
//报废
|
|
|
|
|
doCreateScrap(assemblyModel,userName,responsibleParty,organizeCode);
|
|
|
|
|
}
|
|
|
|
|