diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 463494e1c..e6a36f838 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -4746,9 +4746,21 @@ public class EmisBaseService { String startSiteCode = waybill.getStartSiteCode(); List filteredRuleList; if (StringUtils.isNotBlank(startSiteCode)) { - filteredRuleList = ruleList.stream() - .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), startSiteCode)) - .collect(Collectors.toList()); + if ("51000".equals(startSiteCode) || "51200".equals(startSiteCode)) { + filteredRuleList = ruleList.stream() + .filter(rule -> "51000".equals(rule.getStartSiteCode()) + || "51200".equals(rule.getStartSiteCode())) + .collect(Collectors.toList()); // 无锡,张家港 + } else if ("25001".equals(startSiteCode) || "25000".equals(startSiteCode)) { + filteredRuleList = ruleList.stream() + .filter(rule -> "25001".equals(rule.getStartSiteCode()) + || "25000".equals(rule.getStartSiteCode())) + .collect(Collectors.toList()); // 南京市场部、南京分拨中心 + } else { + filteredRuleList = ruleList.stream() + .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), startSiteCode)) + .collect(Collectors.toList()); + } } else if ("51000".equals(sendSiteCode) || "51200".equals(sendSiteCode)) { filteredRuleList = ruleList.stream() .filter(rule -> "51000".equals(rule.getStartSiteCode())