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

@@ -107,7 +107,9 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
                 throw new ImppBusiException(String.format("【%s】此条码扫描顺序错误，请检查数据！", model.getSn()));
             }
         }
+
         //校验客户零件信息是否存在
+        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);
@@ -116,9 +118,11 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
             }
         }
 
+    }
+
     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()));
         }