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 617a1c8..241778b 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 @@ -371,10 +371,16 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) { String destLocateNo = getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()); for (MesPartModel mesPartModel : mesPartModels) { - doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题(仅在“非拆解”模式下才创建移库单) + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId()); + } } } else { - doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题(仅在“非拆解”模式下才创建移库单) + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } } } @@ -397,7 +403,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { workCenterCode = mesPartInspection.getWorkCenterCode(); } if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { - doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + //20250527-47187 PCN-电子化返工拆解功能问题(仅在“非拆解”模式下才创建移库单) + if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } } else { //拆解