Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -371,13 +371,19 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
                     String destLocateNo = getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId());
                     for (MesPartModel mesPartModel : mesPartModels) {
+                        //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
+                        if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
                             doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId());
                         }
+                    }
                 } else {
+                    //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
+                    if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
                         doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
                     }
                 }
             }
+        }
         if (MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.LOT.getValue() == mesReworkTask.getType()) {
             mesReworkTask.setReworkedQty(requestModel.getReworkedQty());
             mesReworkTask.setScrapQty(requestModel.getScrapQty());
@@ -397,8 +403,11 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 workCenterCode = mesPartInspection.getWorkCenterCode();
             }
             if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
+                //20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
+                if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
                     doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
                 }
+            }
         } else {
             //拆解
             if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){