外部解析条码长度卡控

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

@@ -358,7 +358,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
             model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.NORMAL.getValue());
-            ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
+            ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getPartInspection().getModifyUser());
             partInspectionRepository.save(model.getPartInspection());
 
             //移库 转正常、放行：8000移至2000
@@ -435,7 +435,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             model.getPartInspection().setDefectTypeId(person.getId());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue());
             model.getPartInspection().setRejectQty(model.getPartInspection().getQty());
-            ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
+            ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getPartInspection().getModifyUser());
             partInspectionRepository.save(model.getPartInspection());
             if (isOrder) {
                 MesMove move = createMove(model, source, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE);
@@ -460,7 +460,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
             model.getPartInspection().setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue());
             model.getPartInspection().setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.RELEASE.getValue());
-            ConvertBean.serviceModelUpdate(sn, model.getPartInspection().getModifyUser());
+            ConvertBean.serviceModelUpdate(model.getPartInspection(), model.getPartInspection().getModifyUser());
             partInspectionRepository.save(model.getPartInspection());
 
 

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

@@ -1,10 +1,8 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesJisShippingService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesShippingLoadingCheckService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesSortShippingCheckService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.*;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSortShippingCheckModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
@@ -81,6 +79,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     @Autowired
     private MesPartShippingGroupService mesPartShippingGroupService;
 
+    @Autowired
+    private IMesConfigService mesConfigService;
+
     @Override
     public MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement) {
         //校验发运单是否存在
@@ -427,6 +428,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     }
 
     private MesShippingOrderManagementDetail getMesShippingOrderManagementDetail(MesSortShippingCheckModel model, String org) {
+        //外部解析条码长度卡控
+        String cfgValue = mesConfigService.getCfgValue(org, MesPcnExtConstWords.MAX_SHIPPING_BARCODE_LENGTH);
+        if(Integer.parseInt(cfgValue) < model.getSn().length()) MesPcnException.throwMesBusiException("【%s】此条码长度超过【%s】位，请检查数据！", model.getSn(),cfgValue);
         List<MesShippingOrderManagementDetail> detailList = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getCustPartNo()) && model.getSn().startsWith(k.getCustPartNo()) && StringUtils.isEmpty(k.getBarcode()) && !Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).collect(Collectors.toList());
         MesShippingOrderManagementDetail mesShippingOrderManagementDetail = null;
         for (MesShippingOrderManagementDetail managementDetail : detailList) {

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -404,4 +404,6 @@ public class MesPcnExtConstWords {
     public static final String SHIP_PASS = "跳过";
     public static final String STRONGER_PASS = "强过";
 
+    //发运解析条码最大长度
+    public static final String MAX_SHIPPING_BARCODE_LENGTH = "MAX_SHIPPING_BARCODE_LENGTH";
 }