站点信息基础数据

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

@@ -202,7 +202,7 @@ public class MesRecyclablePackageBindingServiceImpl implements IMesRecyclablePac
         List<MesProduceSn> produceSnList = mesProduceSnExtService.getProduceSnList(mesRecyclablePackageBindingModel.getOrganizeCode(), mesRecyclablePackageBindingModel.getProductSn());
         if (CollectionUtils.isEmpty(produceSnList)) {
             //外协件校验
-            MesRecyclablePackagePart mesRecyclablePackagePart = getMesRecyclablePackagePart(mesRecyclablePackageBindingModel, mesRecyclablePackagePartList);
+            MesRecyclablePackagePart mesRecyclablePackagePart = getMesRecyclablePackagePart(mesRecyclablePackageBindingModel, mesRecyclablePackagePartList.stream().filter(t -> !Objects.isNull(t.getProductSnCheckType()) && MesExtEnumUtil.PRODUCT_SN_CHECK_TYPE.PRODUCT_SN_CHECK_TYPE_20.getValue() == t.getProductSnCheckType()).collect(Collectors.toList()));
             if(Objects.isNull(mesRecyclablePackagePart)){
                 MesPcnException.throwMesBusiException("条码【%s】不存在", mesRecyclablePackageBindingModel.getProductSn());
             }
@@ -220,11 +220,13 @@ public class MesRecyclablePackageBindingServiceImpl implements IMesRecyclablePac
     private MesRecyclablePackagePart getMesRecyclablePackagePart(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel, List<MesRecyclablePackagePart> mesRecyclablePackagePartList) {
         //外协件
         MesRecyclablePackagePart checkPassRecyclablePackagePart = null;
-        for (MesRecyclablePackagePart mesRecyclablePackagePart : mesRecyclablePackagePartList) {
+        if(!CollectionUtils.isEmpty(mesRecyclablePackagePartList)){
-            // 校验正则表达式
+            for (MesRecyclablePackagePart mesRecyclablePackagePart : mesRecyclablePackagePartList) {
-            if (checkRule(mesRecyclablePackageBindingModel, mesRecyclablePackagePart.getProductSnRule())) {
+                // 校验正则表达式
-                checkPassRecyclablePackagePart = mesRecyclablePackagePart;
+                if (checkRule(mesRecyclablePackageBindingModel, mesRecyclablePackagePart.getProductSnRule())) {
-                break;
+                    checkPassRecyclablePackagePart = mesRecyclablePackagePart;
+                    break;
+                }
             }
         }
         return checkPassRecyclablePackagePart;