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 2ca357da4..b40ac351a 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 @@ -4993,21 +4993,9 @@ public class EmisBaseService { String startSiteCode = waybill.getStartSiteCode(); List 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)) diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 485ba5f0f..f00bbef64 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 remark, '0' as del_flag, w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code,