From 8a4b3384d7cf71c37ec29f2664dfa9ecae4489fd Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 6 Aug 2025 17:25:15 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E5=A7=8B=E5=8F=91=E7=BD=91?= =?UTF-8?q?=E7=82=B9=E5=8D=97=E4=BA=AC=E5=88=86=E6=8B=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?-=E5=B8=82=E5=9C=BA=E9=83=A8=E5=8F=AF=E4=BA=92=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=94=A1-=E5=BC=A0=E5=AE=B6=E6=B8=AF?= =?UTF-8?q?=E5=8F=AF=E4=BA=92=E6=8D=A2=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/service/EmisBaseService.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 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 41b09003f..7bb977ad6 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 @@ -4677,9 +4677,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())