From d5d603f35215c030e7e0b35f6e68e213f060177b Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 08 三月 2022 13:14:39 +0800
Subject: [PATCH] #导出导入功能改善

---
 src/main/resources/mapper/LocDetlMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b0d6b6d..c5c38c7 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -43,6 +43,9 @@
         <if test="mat_name!=null and mat_name!='' ">
             and a.mat_name like '%' + #{mat_name} + '%'
         </if>
+        <if test="str3!=null and str3!=''" >
+            and a.str3 like '%'+#{str3}+'%'
+        </if>
         <if test="qty!=null and qty!='' ">
             and a.qty = #{qty}
         </if>
@@ -93,7 +96,7 @@
         where loc_no=#{locNo}
     </select>
     <select id="getStockStatis" resultMap="BaseResultMap">
-        select a.mat_name,a.mat_no,a.supplier,sum(a.qty) qty  from
+        select a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty  from
         (
         select
         ROW_NUMBER() over (order by c.appe_time,c.mat_no,c.loc_no) as row,
@@ -101,7 +104,7 @@
         from asr_loc_detl c
         ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
          <include refid="stockOutCondition"></include>
-        group by a.mat_no,a.mat_name,a.supplier
+        group by a.mat_no,a.mat_name,a.supplier,a.str3
     </select>
     <select id="getStockStatisCount" resultType="integer">
         select

--
Gitblit v1.9.1