Merge remote-tracking branch 'origin/mes-dev' 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())){
@@ -847,7 +856,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) {
@@ -872,7 +881,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);
                 }