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/base/MesReworkTaskServiceImpl.java

@@ -362,7 +362,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             if (mesPartInspection != null) {
                 workCenterCode = mesPartInspection.getWorkCenterCode();
             }
-            if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType() && !headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
+            if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
+                if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
                     for (MesPartModel mesPartModel : mesPartModels) {
                         doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId());
                     }
@@ -370,6 +371,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                     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());