Merge branch 'uat-temp-wj-chongqingdaqu-prod' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-prod

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

@@ -789,8 +789,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         if (StringUtil.isEmpty(detail.getVin())) {
             MesPcnException.throwMesBusiException("发运单【%s】零件号【%s】vin号为空，请检查数据", orderManagement.getShippingCode(), detail.getPartNo());
         }
-        MesConfig config = mesConfigService.getCfgValueByCode(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG);
-        if (config == null || StringUtils.isEmpty(config.getCfgValue()) || !config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) {
+        final boolean matchCfgValue = mesConfigService.checkCfgValueIsContainItem(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG, null, null, ",", orderManagement.getShippingGroupCode());
+        if (!matchCfgValue) {
             return;
         }