Merge branch 'uat-temp-wj-241223-44507' into dev

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

@@ -87,7 +87,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
         if (!scanFlg) {
             throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo()));
         }
-        model.setMsg(String.format("条码【%s】扫描完成，请扫描下一个条码",model.getSn()));
+        model.setMsg(String.format("条码【%s】扫描完成，请扫描下一个条码", model.getSn()));
         return model;
     }
 
@@ -107,18 +107,22 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
                 throw new ImppBusiException(String.format("【%s】此条码扫描顺序错误，请检查数据！", model.getSn()));
             }
         }
+
         //校验客户零件信息是否存在
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(detail.getPartNo(), "erpPartNo", packBean);
-        DdlPreparedPack.getStringEqualPack(detail.getCustPartNo(), "custPartNo", packBean);
-        if (!mesCustomerPartRepository.isExitByHql(packBean)) {
-            throw new ImppBusiException(String.format("零件号【%s】客户零件号【%s】关系不存在，请检查数据！", detail.getPartNo(), detail.getCustPartNo()));
+        if (StringUtils.isEmpty(shippingGroup.getScanMethodJudgment()) || shippingGroup.getScanMethodJudgment().equals(MesExtEnumUtil.SHIPPING_GROUP_SCAN_METHOD_JUDGMENT.CUSTOMER_PART_NO.getValueStr())) {
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
+            DdlPreparedPack.getStringEqualPack(detail.getPartNo(), "erpPartNo", packBean);
+            DdlPreparedPack.getStringEqualPack(detail.getCustPartNo(), "custPartNo", packBean);
+            if (!mesCustomerPartRepository.isExitByHql(packBean)) {
+                throw new ImppBusiException(String.format("零件号【%s】客户零件号【%s】关系不存在，请检查数据！", detail.getPartNo(), detail.getCustPartNo()));
+            }
         }
+
     }
 
     private MesProduceSn checkSn(MesSortShippingCheckModel model) {
-        //校验条码是否重复扫描
-        Optional<MesShippingOrderManagementDetail> optional = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getBarcode()) && k.getBarcode().equals(model.getSn())).findFirst();
+        //校验条码是否重复扫描 (不区分大小写)
+        Optional<MesShippingOrderManagementDetail> optional = model.getDetailList().stream().filter(k -> !StringUtils.isEmpty(k.getBarcode()) && k.getBarcode().equalsIgnoreCase(model.getSn())).findFirst();
         if (optional.isPresent()) {
             throw new ImppBusiException(String.format("【%s】此条码已经扫描过，请检查数据！", model.getSn()));
         }