From 9eb9fc408b2c2ac410fdc30b846d3ec9e1b77c3f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Jun 2024 21:24:28 +0800
Subject: [PATCH] md

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

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 10aa0e200..9e800bc4d 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -563,16 +563,15 @@
             </if>
 
 
-            <if test="blSign != null  and blSign == '1'">
+            <if test="blSign != null  and blSign == 1">
                 and bl_sign='1'
             </if>
 
-            <if test="blSign != null  and blSign == '0'">
+            <if test="blSign != null  and blSign == 0">
                 and bl_sign!='1'
             </if>
 
 
-
             <if test="params.beginSendDate != null and params.beginSendDate != ''">
                 and a.send_date <![CDATA[ >= ]]>  #{params.beginSendDate}
             </if>
@@ -605,7 +604,7 @@
 
             <if test="params.isNeedBatch != null and params.isNeedBatch == 1">
                 and a.bill_code not in( select etb.bill_code from emis_tms_site_batch_dtl etb   where etb.del_flag='0'  )
-                and a.bl_is_question = '0'
+                and bl_sign!='1' and waybill_status!='40'
             </if>