From 99aa99aedc575070261c6877ba5c83a34bf5f9d1 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 8 Dec 2025 16:40:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20=20tms-=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1-=E5=88=86=E6=89=B9=E8=BF=9B=E4=BB=93=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index f5eee5f4c..27a0056ee 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -576,6 +576,7 @@
         and d.bill_code = #{billCode}
         and b.del_flag = '0'
         and d.del_flag = '0'
+        and d.waybill_batch_status != '2'
         <if test="id != null">AND d.id != #{id}</if>
         group by b.id, b.batch_no, b.batch_name, b.batch_date, b.supplier_code, b.trans_line_type,
                  b.product_type, b.batch_type, b.trans_type, b.start_site_code, b.send_country,

From f60c34fe434d2d03b21b890d82e9c574332650b7 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 8 Dec 2025 16:53:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20=20tms-=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=88=90=E6=9C=AC=E5=88=97=E8=A1=A8-?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE=E5=A4=9A=E4=B8=AA=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index 66d02caec..db72d4387 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -205,7 +205,7 @@
             <if test="feeType != null  and feeType != ''"> and fee_type = #{feeType}</if>
             <if test="splitType != null  and splitType != ''"> and split_type = #{splitType}</if>
             <if test="transType != null  and transType != ''"> and trans_type=#{transType}</if>
-            <if test="transSignNo != null  and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if>
+            <if test="transSignNo != null  and transSignNo != ''"> and FIND_IN_SET(trans_sign_no,#{transSignNo})</if>
             <if test="supplierCode != null  and supplierCode != ''"> and supplier_code=#{supplierCode} </if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="sendPlace != null  and sendPlace != ''"> and send_place=#{sendPlace}</if>