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 b61a91b4f..41b09003f 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 @@ -4676,7 +4676,11 @@ public class EmisBaseService { String sendSiteCode = waybill.getSendSiteCode(); String startSiteCode = waybill.getStartSiteCode(); List filteredRuleList; - if ("51000".equals(sendSiteCode) || "51200".equals(sendSiteCode)) { + if (StringUtils.isNotBlank(startSiteCode)) { + 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()) || "51200".equals(rule.getStartSiteCode())) @@ -4686,10 +4690,6 @@ public class EmisBaseService { .filter(rule -> "25001".equals(rule.getStartSiteCode()) || "25000".equals(rule.getStartSiteCode())) .collect(Collectors.toList()); // 南京市场部、南京分拨中心 - } else if (StringUtils.isNotBlank(startSiteCode)) { - filteredRuleList = ruleList.stream() - .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), startSiteCode)) - .collect(Collectors.toList()); } else { filteredRuleList = ruleList.stream() .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), sendSiteCode))