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

Merge pull request 'develop' (#201) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/201
This commit is contained in:
heyu 2025-10-18 14:50:36 +08:00
commit f63af663cc
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4993,21 +4993,9 @@ public class EmisBaseService {
String startSiteCode = waybill.getStartSiteCode(); String startSiteCode = waybill.getStartSiteCode();
List<EmisTransPlanRule> filteredRuleList; List<EmisTransPlanRule> filteredRuleList;
if (StringUtils.isNotBlank(startSiteCode)) { 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() filteredRuleList = ruleList.stream()
.filter(rule -> "25001".equals(rule.getStartSiteCode()) .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), startSiteCode))
|| "25000".equals(rule.getStartSiteCode())) .collect(Collectors.toList());
.collect(Collectors.toList()); // 南京市场部、南京分拨中心
} else { } else {
filteredRuleList = ruleList.stream() filteredRuleList = ruleList.stream()
.filter(rule -> StringUtils.equals(rule.getStartSiteCode(), sendSiteCode)) .filter(rule -> StringUtils.equals(rule.getStartSiteCode(), sendSiteCode))

2
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
View File

@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<when test="missCount == -4 or missCount == -7"> <when test="missCount == -4 or missCount == -7">
<!-- 当missCount=-4时，查询emis_waybill_batch_status表 --> <!-- 当missCount=-4时，查询emis_waybill_batch_status表 -->
select select
distinct w.bill_code, null as id, '已组批次成功' as miss_reason, b.bill_code, null as id, '已组批次成功' as miss_reason,
null as create_by, null as create_time, null as update_by, null as update_time, null as create_by, null as create_time, null as update_by, null as update_time,
null as remark, '0' as del_flag, null as remark, '0' as del_flag,
w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code, w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code,