Merge branch 'uat_temp_xw_202502100000_44424' into dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java

@@ -509,7 +509,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                             srcNo = version.getReceiveInventoryPoint();
                         }
                         String destLocateNo = getDestLocateNo(model, org);
-                        if(!Objects.equals(srcNo, destLocateNo)) {
+                        if(headModel && !Objects.equals(srcNo, destLocateNo)) {
                             throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
                         }
                     }
@@ -642,11 +642,13 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                         if (version != null) {
                             srcNo = version.getReceiveInventoryPoint();
                         }
+                        if (headModel ) {
                             String destLocateNo = getDestLocateNo(model, org);
                             if (!Objects.equals(srcNo, destLocateNo)) {
                                 throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
                             }
                         }
+                    }
 
                     checkProduceSn(produceSn, model.getSn());
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS.getValue());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java

@@ -466,12 +466,15 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
 
             if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                List<MesMove> moveList = new ArrayList<>();
                 for (MesPartModel mesPartModel : mesPartModels) {
                     //移库 转正常、放行：8000移至2000
                     MesMove move = createMove(model, sourceValue, mesPartModel.getLocateNo(), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE, mesPartModel.getPartNo());
                     ConvertBean.serviceModelInitialize(move, model.getUserName());
-                    moveRepository.save(move);
+                    moveList.add(move);
                 }
+                moveRepository.saveAll(moveList);
+
             } else if (headModel) {
                 //移库 转正常、放行：8000移至2000
                 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
@@ -536,11 +539,13 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
             if (!headModel) {
                 if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                    List<MesMove> moveList = new ArrayList<>();
                     for (MesPartModel mesPartModel : mesPartModels) {
                         MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE, mesPartModel.getPartNo());
                         ConvertBean.serviceModelInitialize(move, model.getUserName());
-                        moveRepository.save(move);
+                        moveList.add(move);
                     }
+                    moveRepository.saveAll(moveList);
                 }
             } else {
                 MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE);
@@ -591,11 +596,15 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
                 if (!headModel) {
                     if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                        List<MesMove> moveList = new ArrayList<>();
+
                         for (MesPartModel mesPartModel : mesPartModels) {
                             MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE,mesPartModel.getPartNo());
                             ConvertBean.serviceModelInitialize(move,model.getUserName());
-                            moveRepository.save(move);
+                            moveList.add(move);
                         }
+                        moveRepository.saveAll(moveList);
+
                     }
                 } else {
                     MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE);
@@ -610,12 +619,16 @@ public class MesNcProcessingService implements IMesNcProcessingService {
                 }
                 if (!headModel) {
                     if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                        List<MesMove> moveList = new ArrayList<>();
+
                         for (MesPartModel mesPartModel : mesPartModels) {
                             //移库 转报废 根据责任方库区对应关系的主数据，选择哪个责任方，就移动到哪个库区（8000移至8002/8003）
                             MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE, mesPartModel.getPartNo());
                             ConvertBean.serviceModelInitialize(move,model.getUserName());
-                            moveRepository.save(move);
+                            moveList.add(move);
                         }
+                        moveRepository.saveAll(moveList);
+
                     }
                 } else {
                     //移库 转报废 根据责任方库区对应关系的主数据，选择哪个责任方，就移动到哪个库区（8000移至8002/8003）
@@ -670,12 +683,16 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
 
             if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                List<MesMove> moveList = new ArrayList<>();
+
                 for (MesPartModel mesPartModel : mesPartModels) {
                     //移库 转正常、放行：8000移至2000
                     MesMove move = createMove(model, sourceValue, mesPartModel.getLocateNo(), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE, mesPartModel.getPartNo());
                     ConvertBean.serviceModelInitialize(move, model.getUserName());
-                    moveRepository.save(move);
+                    moveList.add(move);
                 }
+                moveRepository.saveAll(moveList);
+
             } else if (headModel) {
                 //移库 转正常、放行：8000移至2000
                 MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);