demand: tms-运输管理-漏组批次全量/实时扫描移除南京市场部-南京分拨中心共享逻辑
committer: heyu
This commit is contained in:
parent
13a9ed65c6
commit
e8ca11cd10
@ -4993,21 +4993,9 @@ public class EmisBaseService {
|
||||
String startSiteCode = waybill.getStartSiteCode();
|
||||
List<EmisTransPlanRule> filteredRuleList;
|
||||
if (StringUtils.isNotBlank(startSiteCode)) {
|
||||
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 ("25001".equals(sendSiteCode) || "25000".equals(sendSiteCode)) {
|
||||
filteredRuleList = ruleList.stream()
|
||||
.filter(rule -> "25001".equals(rule.getStartSiteCode())
|
||||
|| "25000".equals(rule.getStartSiteCode()))
|
||||
.collect(Collectors.toList()); // 南京市场部、南京分拨中心
|
||||
.filter(rule -> StringUtils.equals(rule.getStartSiteCode(), startSiteCode))
|
||||
.collect(Collectors.toList());
|
||||
} else {
|
||||
filteredRuleList = ruleList.stream()
|
||||
.filter(rule -> StringUtils.equals(rule.getStartSiteCode(), sendSiteCode))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user