Merge branch 'dev-temp-xw-202502170000-45135' into dev

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

@@ -786,6 +786,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     return;
                 }
                 moveRule = sortShippingModel.getMesMoveRuleMap().get(itemPart.getEsd());
+                if (moveRule == null) {
+                    detail.setSaveFlag(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+                    log.info("客供品移库零件【{}】维护的移库规则不做处理", detail.getPartNo(), orderManagement.getShippingGroupCode());
+                    return;
+                }
                 if  (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.MOVE.getValue() == moveRule.getReportType()) {
                     doCreateReworkMove(orderManagement.getOrganizeCode(),userInfo,moveRule.getErpSrcLocateNo(),moveRule.getErpDestLocateNo(), "", detail.getPartNo(), detail.getActualQty(),detail.getBarcode());
                 } else if (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.NOT_HANDLER.getValue() == moveRule.getReportType()) {