From 8e60cdeab1a292b6f617b75a922ae300556edd55 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 4 Nov 2025 17:48:43 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84=E7=90=86=20-=20?=
 =?UTF-8?q?=E5=B7=B2=E5=BC=80=E7=A5=A8=20-=20=E5=AE=9A=E5=88=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA-=E5=AE=A2=E6=88=B7=E4=BB=98=E6=AC=BE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E3=80=81=E6=94=B6=E6=AC=BE=E7=99=BB=E8=AE=B0=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=8B=BC=E6=8E=A5=E6=97=B6=E6=8C=89=E7=85=A7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=BB=8E=E5=B0=8F=E5=88=B0=E5=A4=A7=E7=9A=84=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E6=8B=BC=E6=8E=A5=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java   | 6 +++---
 .../src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml | 2 +-
 2 files changed, 4 insertions(+), 4 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 4a925e091..3cbb4ea92 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
@@ -5428,9 +5428,9 @@ public class EmisBaseService {
                      String supplierNames = group.stream().map(EmisTransPlanRule::getSupplierName)
                              .filter(Objects::nonNull).distinct().collect(Collectors.joining(","));
                      EmisTransPlanRule first = group.get(0);
-                     if (first.getEndDate().before(waybill.getSendDate()) || first.getStartDate().after(waybill.getSendDate())) {
-                         continue;
-                     }
+//                     if (first.getEndDate().before(waybill.getSendDate()) || first.getStartDate().after(waybill.getSendDate())) {
+//                         continue;
+//                     }
                      String missReason = String.format("%s-%s-%s", first.getStartSiteName(),
                              first.getNextSiteName(), supplierNames);
                      EmisTmsSiteBatchMiss miss = createMissRecord(waybill);
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
index b2106a544..e396d2c4f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
@@ -229,7 +229,7 @@
     </select>
 
     <select id="selectEmisWayBillByBatchNo" parameterType="String" resultMap="com.xdadan.erp.emis.mapper.EmisWaybillMapper.EmisWaybillResult">
-        select a.id, a.bill_code,a.trans_line_type, a.product_type,a.start_site_code,a.send_site_code
+        select a.*
         from emis_waybill a
                  left join emis_tms_site_batch_dtl b on a.bill_code = b.bill_code and b.del_flag = '0'
         where b.batch_no = #{batchNo}