From e6b88ade6b3ff9f0dc9c21473e5f298de2659aa1 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 5 Dec 2025 17:37:57 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=89=80=E6=9C=89=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9e86554f8..dbafce4cd 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2435,6 +2435,8 @@
         ifnull(round(sum(settlement_weight),2),0) as totalSettlementWeight,
         ifnull(round(sum(freight),2),0) as totalFreight
         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'
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="id != null "> and a.id = #{id}</if>
@@ -2462,6 +2464,7 @@
             <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="openId != null  and openId != ''"> and open_id like concat('%', #{openId}, '%')</if>
+            <include refid="salesSupportFilter"/>
             <if test="receiveName != null  and receiveName != ''"> and receive_name like concat('%', #{receiveName}, '%')</if>
             <if test="receiveCompany != null  and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
             <if test="receiveMobile != null  and receiveMobile != ''"> and receive_mobile like concat('%', #{receiveMobile}, '%')</if>
@@ -2568,7 +2571,6 @@
             <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')</if>
 
 
-            <include refid="salesSupportFilter"/>
             <if test="sendDate != null "> and send_date = #{sendDate}</if>
             <if test="dispatchManCode != null  and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
             <if test="dispatchSiteCode != null  and dispatchSiteCode != ''"> and dispatch_site_code=#{dispatchSiteCode}</if>