From 9880fb9c0d0a1445d7288d8b0022065cccfff3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 10:06:19 +0800
Subject: [PATCH] Merge branch 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 60a5ffa..aa3488a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -199,6 +199,21 @@
         (
             select
             no = 1,
+            orderBy = 'true',
+            b.bay1 as bay,
+            sum(anfme) as count
+            from asr_loc_detl a
+            left join asr_loc_mast b on a.loc_no = b.loc_no
+            where 1=1
+            and b.loc_sts = 'F'
+            and a.matnr = #{matnr}
+            and b.row1 >= 31
+            and b.row1 &lt;= 32
+            group by b.bay1
+            union
+            select
+            no = 2,
+            orderBy = 'true',
             b.bay1 as bay,
             sum(anfme) as count
             from asr_loc_detl a
@@ -211,8 +226,9 @@
             group by b.bay1
             union
             select
-            no = 2,
-            b.bay1,
+            no = 3,
+            orderBy = 'false',
+            b.bay1 as bay,
             sum(anfme) as count
             from asr_loc_detl a
             left join asr_loc_mast b on a.loc_no = b.loc_no
@@ -223,7 +239,7 @@
             and b.row1 &lt;= 30
             group by b.bay1
         ) a
-        order by count desc
+        order by no, count desc
     </select>
 
     <select id="queryStock" resultMap="BaseResultMap">
@@ -233,17 +249,24 @@
         left join asr_loc_mast b on a.loc_no = b.loc_no
         where 1=1
         <if test="no!=null and no == 1">
+            and b.row1 >= 31
+            and b.row1 &lt;= 32
+        </if>
+        <if test="no!=null and no == 2">
             and b.row1 >= 2
             and b.row1 &lt;= 17
         </if>
-        <if test="no!=null and no == 2">
+        <if test="no!=null and no == 3">
             and b.row1 >= 18
             and b.row1 &lt;= 30
         </if>
         and a.matnr = #{matnr}
         and b.bay1 = #{bay}
         and b.loc_sts = 'F'
-        order by b.row1 asc
+        order by b.row1
+        <if test="orderBy != null and orderBy != '' and orderBy == 'false'">
+            desc
+        </if>
     </select>
 
     <select id="queryStockAnfme" resultType="java.lang.Double">
@@ -277,5 +300,26 @@
             batch LIKE '%[a-z]%'
     </select>
 
+    <select id="selectSameDetl" resultType="java.lang.String">
+        SELECT
+        ld.loc_no
+        FROM asr_loc_detl ld
+        LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+        LEFT JOIN (
+            select
+            loc_no,
+            count(1) as count
+            from asr_loc_detl
+            where 1=1
+            group by loc_no
+        ) dual on dual.loc_no = lm.loc_no
+        WHERE 1 = 1
+        AND ld.matnr = #{matnr}
+        AND (lm.row1 >= #{start} AND lm.row1 &lt;= #{end})
+        AND (lm.loc_sts = 'F')
+        AND dual.count = 1
+        ORDER BY lm.modi_time ASC
+    </select>
+
 
 </mapper>

--
Gitblit v1.9.1