From d6626dad7f305c3ce34e5a46ae458d854ede242e Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 28 Feb 2026 09:59:53 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20tms-=E8=BF=90=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5/=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=BF=90=E5=8D=95=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=BAtms=20=20tms-=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=A4=96=E9=83=A8=E7=B3=BB=E7=BB=9F=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E4=B8=BAapi=20tms-=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/?=
 =?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0?=
 =?UTF-8?q?-=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 531e7ab71..8c4f45f78 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1983,6 +1983,17 @@
                 </foreach>
             </if>
 
+            <if test="dataFrom != null and dataFrom != ''">
+                <choose>
+                    <when test="dataFrom == 'tms'">
+                        and (a.data_from is null or a.data_from = '' or a.data_from = 'tms')
+                    </when>
+                    <otherwise>
+                        and a.data_from = #{dataFrom}
+                    </otherwise>
+                </choose>
+            </if>
+
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id=#{custOrderId}</if>
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
             <if test="orderStatus != null  and orderStatus != ''"> and order_status=#{orderStatus}</if>