Merge branch 'uat_temp_xw_202502100000_44424' into dev

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

@@ -537,16 +537,14 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
             partInspectionRepository.save(model.getPartInspection());
 
-            if (!headModel) {
+            if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
-                if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+                List<MesMove> moveList = new ArrayList<>();
-                    List<MesMove> moveList = new ArrayList<>();
+                for (MesPartModel mesPartModel : mesPartModels) {
-                    for (MesPartModel mesPartModel : mesPartModels) {
+                    MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE, mesPartModel.getPartNo());
-                        MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE, mesPartModel.getPartNo());
+                    ConvertBean.serviceModelInitialize(move, model.getUserName());
-                        ConvertBean.serviceModelInitialize(move, model.getUserName());
+                    moveList.add(move);
-                        moveList.add(move);
-                    }
-                    moveRepository.saveAll(moveList);
                 }
+                moveRepository.saveAll(moveList);
             } else {
                 MesMove move = createMove(model, sourceValue, areaCode, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE);
                 ConvertBean.serviceModelInitialize(move, model.getUserName());