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 38025556f..d133b38be 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 @@ -4993,12 +4993,7 @@ public class EmisBaseService { String startSiteCode = waybill.getStartSiteCode(); List filteredRuleList; if (StringUtils.isNotBlank(startSiteCode)) { - 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)) { + if ("25001".equals(startSiteCode) || "25000".equals(startSiteCode)) { filteredRuleList = ruleList.stream() .filter(rule -> "25001".equals(rule.getStartSiteCode()) || "25000".equals(rule.getStartSiteCode())) @@ -5008,11 +5003,6 @@ public class EmisBaseService { .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())) - .collect(Collectors.toList()); // 无锡,张家港 } else if ("25001".equals(sendSiteCode) || "25000".equals(sendSiteCode)) { filteredRuleList = ruleList.stream() .filter(rule -> "25001".equals(rule.getStartSiteCode())