From d0a64c9549aa80a98ba0175f4c48931c84ad7491 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 27 Oct 2025 10:30:49 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=20-=E5=AF=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B4=BE?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=20=E2=80=98?=
 =?UTF-8?q?=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9=E2=80=99=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EmisWaybillMapper.xml    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 75e49225d..310adcd05 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -592,6 +592,9 @@
         <if test="sendSiteCode != null and sendSiteCode != ''">
             and a.send_site_code=#{sendSiteCode}
         </if>
+        <if test="startSiteCode != null and startSiteCode != ''">
+            and a.start_site_code=#{startSiteCode}
+        </if>
         and (a.bl_virtual is null or a.bl_virtual != '1')
         <if test="billCode != null and billCode != ''">
             and a.bill_code like concat('%', #{billCode}, '%')
@@ -807,6 +810,10 @@
                 and a.send_site_code=#{sendSiteCode}
             </if>
 
+            <if test="startSiteCode != null  and startSiteCode != ''">
+                and a.start_site_code=#{startSiteCode}
+            </if>
+
             <if test="blSign != null  and blSign !=''">
                 and a.bl_sign=#{blSign}
             </if>
@@ -1334,7 +1341,10 @@
             <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
             <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
 
-            <if test="sendSiteCode != null  and sendSiteCode != ''">and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
+            <if test="sendSiteCode != null  and sendSiteCode != ''">and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+            </if>
+            <if test="startSiteCode != null  and startSiteCode != ''">
+                and a.start_site_code=#{startSiteCode}
             </if>
 
             <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
@@ -1737,6 +1747,8 @@
 
             <if test="sendSiteCode != null  and sendSiteCode != ''"> and FIND_IN_SET(`send_site_code`,#{sendSiteCode})</if>
 
+            <if test="startSiteCode != null  and startSiteCode != ''"> and FIND_IN_SET(`start_site_code`,#{startSiteCode})</if>
+
             <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
             <if test="updateBy != null  and updateBy != ''"> and a.update_by=#{updateBy}</if>
@@ -1952,6 +1964,7 @@
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
+            <if test="startSiteCode != null  and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
             <if test="sendCenterCode != null  and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
              and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2005,6 +2018,7 @@
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
+            <if test="startSiteCode != null  and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
             <if test="sendCenterCode != null  and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
                 and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2208,6 +2222,8 @@
 
             <if test="sendSiteCode != null  and sendSiteCode != ''"> and FIND_IN_SET(a.`send_site_code`,#{sendSiteCode})</if>
 
+            <if test="startSiteCode != null  and startSiteCode != ''"> and FIND_IN_SET(a.`start_site_code`,#{startSiteCode})</if>
+
             <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
             <if test="updateBy != null  and updateBy != ''"> and a.update_by=#{updateBy}</if>
@@ -2520,6 +2536,7 @@
 
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
             <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
+            <if test="startSiteCode != null  and startSiteCode != ''"> and a.start_site_code= #{startSiteCode}</if>
 
             <if test="custNo != null  and custNo != ''"> and a.cust_no=#{custNo}</if>
             <if test="transLineType != null  and transLineType != ''"> and a.trans_line_type=#{transLineType}</if>