From c840fb3d53789de4af1accbf3fe7f5d6474e14c4 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 1 Dec 2025 09:34:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?=
 =?UTF-8?q?=20=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=E7=BB=84=E6=89=B9=E6=AC=A1=20-=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E2=80=9C=E8=BF=90=E8=BE=93=E5=8F=B7=E2=80=9D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=20commit?=
 =?UTF-8?q?ter:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java   | 4 ++++
 emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
index 44e1601b2..0e33c2614 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
@@ -79,6 +79,10 @@ public class EmisTmsSiteBatchController extends EmisBaseController
             emisTmsSiteBatch.setBatchNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getBatchNo()));
         }
 
+        if(!StringUtils.isEmpty(emisTmsSiteBatch.getCarNo())){
+            emisTmsSiteBatch.setCarNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getCarNo()));
+        }
+
         if(emisTmsSiteBatch.getParams().get("billCode")!=null){
             String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString();
             billCodeStr=WaybillHelper.formatQueryValue(billCodeStr);
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index a1843bdbf..f5eee5f4c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -174,7 +174,7 @@
             <if test="etd != null "> and etd = #{etd}</if>
             <if test="eta != null "> and eta = #{eta}</if>
             <if test="packNum != null "> and pack_num = #{packNum}</if>
-            <if test="carNo != null  and carNo != ''"> and car_no like concat('%', #{carNo}, '%')</if>
+            <if test="carNo != null  and carNo != ''">  and FIND_IN_SET(`car_no`,#{carNo})</if>
             <if test="shipNo != null  and shipNo != ''"> and ship_no=#{shipNo}</if>
             <if test="clearanceResStatus != null  and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</if>
             <if test="declareResStatus != null  and declareResStatus != ''"> and declare_res_status=#{declareResStatus}</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 03a2ba25b..c5eb0eee8 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3933,7 +3933,7 @@
         <if test="lineCode != null and lineCode != ''">
             and a.trans_line_type = #{lineCode}
         </if>
---         and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01'
+        and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01'
 --         and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY),
 --         '%Y-%m-%d')
         and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country !=

From 52944a4a3c6d8e547ef1a2886311f99634f2dc82 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 1 Dec 2025 15:31:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?=
 =?UTF-8?q?=20=E8=B4=B9=E7=94=A8=E7=A1=AE=E8=AE=A4=E7=AE=A1=E7=90=86=20-?=
 =?UTF-8?q?=20=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8-=E5=88=86=E6=89=B9=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E4=BB=B6=E6=95=B0=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E4=BD=93=E7=A7=AFbug=E4=BF=AE=E5=A4=8D=20committer:?=
 =?UTF-8?q?=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
index e396d2c4f..8aa8367e0 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
@@ -83,6 +83,8 @@
                 <foreach item="status" collection="params.waybillBatchStatusList" open="(" separator="," close=")">
                     #{status}
                 </foreach>
+                and exists (select 1 from emis_tms_site_batch batch where batch.batch_no =
+                emis_tms_site_batch_dtl.batch_no and batch.del_flag='0')
             </if>
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">