aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 始发网点南京分拨中心-市场部可互换，无锡-张家港可互换' (#146) from aike into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/146
This commit is contained in:
heyu 2025-08-06 18:12:29 +08:00
commit 5895784ea8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -4677,9 +4677,21 @@ public class EmisBaseService {
String startSiteCode = waybill.getStartSiteCode();
List<EmisTransPlanRule> 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())