From c866b8a4cccdfe330ae2da833c62577d6a902a03 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 19 四月 2022 10:14:27 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |   52 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3137705..277482a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -197,52 +197,66 @@
         where loc_no=#{locNo}
     </select>
     <select id="getStockStatis" resultMap="BaseResultMap">
-<!--        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,-->
-<!--        c.*-->
-<!--        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,a.str3-->
-
         select * from
         (
         select ROW_NUMBER() over (order by a.mat_no) as row,
-        a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5  from
+        a.mat_name,a.mat_no,a.str3,sum(a.qty) qty,sum(all_qty) allQty, specs,unit,color,qty_box,weight,str4,str5  from
         (
         select
-        mat_name,mat_no,supplier,str3,qty,specs,unit,color,qty_box,weight,str4,str5
+        mat_name,mat_no,str3,qty,all_qty,specs,unit,color,qty_box,weight,str4,str5
         from asr_loc_detl c
         where 1=1
         <include refid="stockOutCondition1"></include>
         ) a
-        group by a.mat_no,a.mat_name,a.supplier,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
+        group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
         ) d
         where 1=1
         and row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        order by mat_no,specs
+<!--        select * from-->
+<!--        (-->
+<!--        select ROW_NUMBER() over (order by a.mat_no) as row,-->
+<!--        a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5  from-->
+<!--        (-->
+<!--        select-->
+<!--        mat_name,mat_no,supplier,str3,qty,specs,unit,color,qty_box,weight,str4,str5-->
+<!--        from asr_loc_detl c-->
+<!--        where 1=1-->
+<!--        <include refid="stockOutCondition1"></include>-->
+<!--        ) a-->
+<!--        group by a.mat_no,a.mat_name,a.supplier,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5-->
+<!--        ) d-->
+<!--        where 1=1-->
+<!--        and row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})-->
+<!--        order by a.mat_no,a.supplier-->
     </select>
     <select id="getStockStatisCount" resultType="integer">
         select count(1) from
         (
         select ROW_NUMBER() over (order by a.mat_no) as row,
-        a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5  from
+        a.mat_name,a.mat_no,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5  from
         (
         select
-        mat_name,mat_no,supplier,str3,qty,specs,unit,color,qty_box,weight,str4,str5
+        mat_name,mat_no,str3,qty,specs,unit,color,qty_box,weight,str4,str5
         from asr_loc_detl c
         where 1=1
         <include refid="stockOutCondition1"></include>
         ) a
-        group by a.mat_no,a.mat_name,a.supplier,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
+        group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
         ) d
-
+<!--        select count(1) from-->
+<!--        (-->
+<!--        select ROW_NUMBER() over (order by a.mat_no) as row,-->
+<!--        a.mat_name,a.mat_no,a.supplier,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5  from-->
+<!--        (-->
 <!--        select-->
-<!--        count(1)-->
-<!--        from asr_loc_detl a-->
+<!--        mat_name,mat_no,supplier,str3,qty,specs,unit,color,qty_box,weight,str4,str5-->
+<!--        from asr_loc_detl c-->
 <!--        where 1=1-->
 <!--        <include refid="stockOutCondition1"></include>-->
+<!--        ) a-->
+<!--        group by a.mat_no,a.mat_name,a.supplier,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5-->
+<!--        ) d-->
     </select>
 <!--    <select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">-->
     <select id="getStockStatisExcel" resultMap="BaseResultMap">

--
Gitblit v1.9.1