From f008dd2a947aece3e04a3ebd11f15c49114ec8b3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 5 Jan 2026 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?demand:=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-=20=E5=AF=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/=E5=AF=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0/=E6=B4=BE?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E2=80=9C=E7=8E=B0?=
 =?UTF-8?q?=E9=87=91=E5=AE=A2=E6=88=B7=E2=80=9D=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B9=9F=E5=8C=85=E5=90=AB=E7=8E=B0?=
 =?UTF-8?q?=E9=87=91=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index de2587b03..7769a2b2d 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1941,6 +1941,7 @@
         from emis_waybill a
         left join emis_customer_user a4 on a.cust_no=a4.monthly_pay_code and a4.del_flag='0'
         left join emis_waybill_other wss on a.id=wss.waybill_id and wss.del_flag='0'
+        left join emis_money_user mu on wss.money_user_id=mu.id and mu.del_flag='0'
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="id != null "> and a.id = #{id}</if>
@@ -2256,6 +2257,9 @@
                 and DATEDIFF(NOW(), a.send_date) <![CDATA[ <= ]]> 10
             </if>
 
+            <if test="params.moneyUserId != null and params.moneyUserId != ''">
+                AND mu.id = #{params.moneyUserId}
+            </if>
             <if test="(params.isNeedBatch == null  or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " >
                 <if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'">
                     and (
@@ -2271,6 +2275,21 @@
                         select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
                         )
                     </if>
+                    <if test="params.moneyUserId != null and params.moneyUserId != ''">
+                        or EXISTS (
+                        select 1 from emis_waybill_other wss_mu
+                        inner join emis_money_user emu on wss_mu.money_user_id=emu.id and emu.del_flag='0'
+                        left join sys_user su_payee on emu.payee=su_payee.emp_name and su_payee.del_flag='0'
+                        left join sys_user su_salesmen on emu.salesmen=su_salesmen.emp_name and su_salesmen.del_flag='0'
+                        left join sys_user su_sales_support on emu.sales_support=su_sales_support.emp_name and su_sales_support.del_flag='0'
+                        where wss_mu.waybill_id=a.id and wss_mu.del_flag='0'
+                        and (
+                        su_payee.owner_site_code=#{params.privSiteCode}
+                        or su_salesmen.owner_site_code=#{params.privSiteCode}
+                        or su_sales_support.owner_site_code=#{params.privSiteCode}
+                        )
+                        )
+                    </if>
 
                     or a.salesmen=#{params.privEmpName}
                     or a.payee=#{params.privEmpName}