diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index 5a3922c..b287ba8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -396,8 +396,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { if (mesPartInspection != null) { workCenterCode = mesPartInspection.getWorkCenterCode(); } - doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId()); - + if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } else { //拆解 if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ @@ -928,8 +929,6 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { assemblyList = assemblyList.stream().filter(o->MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue() == o.getAssemblyStatus()).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(assemblyList)){ assemblyList.forEach(t->{ - t.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - t.setDescription(userName + "-" + TimeTool.getNowTime(true) + "-返工解绑软删除"); t.setSystemSyncStatus(CommonEnumUtil.FALSE); t.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue()); ConvertBean.serviceModelUpdate(t, userName);