From 1b6cf5b65ae1e9f3bda861d3cf5f98b2b585b476 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 7 Sep 2024 22:54:17 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisTmsScanRecordMapper.xml   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 2612a32ae..86163919f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -99,6 +99,9 @@
 
     </resultMap>
 
+<!--    and ( b.problem_type is null  or (b.problem_type is not null and (b.problem_type != 173 and  b.problem_type != 170 and  b.problem_type != 151) ) )-->
+
+
     <select id="queryScanStatInfoDtlList" parameterType="EmisWaybill" resultMap="ScanStatInfoDtlResult">
         select main_bill_code as billCode,
             sum(IF(scan_type='10',1,0)) as gotCount,
@@ -115,8 +118,9 @@
                     where
                      b.del_flag='0' and order_status !='0'
                      and a.main_bill_code=b.bill_code
-                     and ( b.problem_type is null  or (b.problem_type is not null and (b.problem_type != 173 and  b.problem_type != 170 and  b.problem_type != 151) ) )
-
+                    and  not EXISTS (
+                        select 1 from emis_waybill_problem_info ewpi where ewpi.bill_code=b.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
+                    )
 
                     <if test="params.billCode != null  and params.billCode != ''">
                      and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
@@ -182,9 +186,9 @@
             select  a.scan_site_code ,count(DISTINCT  a.main_bill_code) as scan_count
             from emis_tms_scan_record a,emis_waybill b
             where  a.del_flag='0' and b.del_flag='0' and a.main_bill_code=b.bill_code
-
-                and ( b.problem_type is null  or (b.problem_type is not null and (b.problem_type != 173 and  b.problem_type != 170 and  b.problem_type != 151) ) )
-
+                    and  not EXISTS (
+                    select 1 from emis_waybill_problem_info ewpi where ewpi.bill_code=b.bill_code and  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
+                    )
                 and  a.scan_type=#{scanType}
 
              <if test="scanType != null  and scanType == '20'">