From 67bfee9aa215fde42cc3c8347028c68b112287ea Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 7 Sep 2024 22:16:35 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisWarehouseIn.java   |  7 +++++--
 .../main/resources/mapper/EmisTmsScanRecordMapper.xml | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
index 5ee117669..8a4af4cc7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
@@ -59,6 +59,10 @@ public class EmisWarehouseIn extends BaseEntity
     private Date confirmDate;
     /* 占用状态 0-未占用 1-已全部占用 2-不分占用 */
     private String usedStatus;
+
+    /* 进仓标记 0-未进仓 1-已进仓 */
+    private String stockInFlag;
+
     /* 状态 0-初始 */
     private String status;
 
@@ -73,8 +77,7 @@ public class EmisWarehouseIn extends BaseEntity
     private BigDecimal totalWeight;
 
 
-    /* 进仓标记 0-未进仓 1-已进仓 */
-    private String stockInFlag;
+
 
     // 入仓批次信息
     private List<EmisWarehouseInBatch> stockInBatchList;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 6d8521ce1..2612a32ae 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -115,6 +115,8 @@
                     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) ) )
+
 
                     <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}, '%') )
@@ -170,6 +172,9 @@
 
 
     <!--获取签收异常扫描统计数据-->
+    <!--and b.bill_code not in (
+    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
+    )-->
 
     <select id="queryScanStatList" parameterType="EmisTmsScanRecord" resultMap="ScanStatDataInfoResult">
         select t1.scan_site_code,t1.scan_count,ifnull(t2.sign_count,0) as sign_count,round(round(ifnull(t2.sign_count,0)/t1.scan_count,3)*100,1) as sign_rate
@@ -177,9 +182,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.bill_code not in (
-                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  ewpi.`problem_type` in(151,173,170)
-                )
+
+                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  a.scan_type=#{scanType}
 
              <if test="scanType != null  and scanType == '20'">