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

@@ -108,8 +108,8 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
             }
         }
 
-        //校验客户零件信息是否存在
-        if (StringUtils.isEmpty(shippingGroup.getScanMethodJudgment()) || shippingGroup.getScanMethodJudgment().equals(MesExtEnumUtil.SHIPPING_GROUP_SCAN_METHOD_JUDGMENT.CUSTOMER_PART_NO.getValueStr())) {
+        //校验客户零件信息是否存在 (默认需要验证, 值可能是[空/0/20])
+        if (StringUtils.isEmpty(shippingGroup.getScanMethodJudgment()) || !shippingGroup.getScanMethodJudgment().equals(MesExtEnumUtil.SHIPPING_GROUP_SCAN_METHOD_JUDGMENT.PART_NO.getValueStr())) {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
             DdlPreparedPack.getStringEqualPack(detail.getPartNo(), "erpPartNo", packBean);
             DdlPreparedPack.getStringEqualPack(detail.getCustPartNo(), "custPartNo", packBean);