From bf5348e94b9651c90ffe11f81ef9d450e160e39f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 27 Jul 2024 06:13:19 +0800
Subject: [PATCH] md

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

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9a701de61..4081c7dcf 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -784,7 +784,7 @@
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            a.del_flag='0' and order_status !='0'
+            a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
@@ -1090,7 +1090,7 @@
             left join emis_site b on a.send_site_code = b.site_code and b.del_flag='0'
             left join emis_site c on a.send_center_code = c.site_code and c.del_flag='0'
         <where>
-            a.del_flag='0' and order_status !='0'
+            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="sendCenterCode != null  and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
@@ -1156,7 +1156,7 @@
         left join emis_site b on a.dispatch_underling_site_code = b.site_code and b.del_flag='0'
         left join emis_site c on a.destination_center_code = c.site_code and c.del_flag='0'
         <where>
-            a.del_flag='0' and order_status !='0'
+            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="sendCenterCode != null  and sendCenterCode != ''"> and a.send_center_code= #{sendCenterCode}</if>
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
@@ -1211,7 +1211,7 @@
         round(sum(freight),2) as totalFreight
         from emis_waybill a
         <where>
-            a.del_flag='0' and order_status !='0'
+            a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
@@ -1485,7 +1485,7 @@
     <select id="selectPrintWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            a.del_flag='0' and order_status !='0'
+            a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET( a.`bill_code`,#{billCode}) or  a.bill_code like concat('%', #{billCode}, '%') )  </if>
             <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>
@@ -1648,7 +1648,7 @@
                payment_remark, order_remark, data_from, bl_special_goods, remark, del_flag, create_by, create_time,
                update_by, update_time, create_site, update_site,ext_info
         from emis_waybill a
-        where a.del_flag='0' and  a.bl_bill = '0' limit 300
+        where a.del_flag='0' and  a.bl_bill = '0' and a.order_status !='0' and a.order_status!='2' limit 300
     </select>
 
     <select id="selectEmisWaybillById" parameterType="Long" resultMap="EmisWaybillResult">