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

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service into develop

Browse Source
This commit is contained in:
aike 2025-08-05 18:02:05 +08:00
commit d0407cf409
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4734,7 +4734,11 @@ public class EmisBaseService {
String sendSiteCode = waybill.getSendSiteCode();
String startSiteCode = waybill.getStartSiteCode();
List<EmisTransPlanRule> 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()))
@ -4744,10 +4748,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))