From e8ca11cd1041de82fd6bda800db8e5e892737695 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 18 Oct 2025 14:23:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20tms-=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=85=A8=E9=87=8F/=E5=AE=9E=E6=97=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8D=97=E4=BA=AC=E5=B8=82=E5=9C=BA=E9=83=A8?= =?UTF-8?q?-=E5=8D=97=E4=BA=AC=E5=88=86=E6=8B=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../xdadan/erp/emis/service/EmisBaseService.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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)) From 6d7fdecb8142bc678e971ce9332b14f9cc6a8591 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 18 Oct 2025 14:49:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20tms-=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E6=89=B9=E6=AC=A1=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=85=A2sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,