From 4b8ed12eee21b703af2653feff4bdf909013bba0 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 5 Aug 2025 17:02:29 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=AD=9F=E5=8A=A0=E6=8B=89?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E6=89=8B=E6=8F=90=E6=BC=8F=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E6=89=AB=E6=8F=8F=E6=9C=AA=E6=A0=B9=E6=8D=AE=E5=A7=8B?= =?UTF-8?q?=E5=8F=91=E7=BD=91=E7=82=B9=E6=89=AB=E6=8F=8Fbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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))