From 64126dfd00ed90af484fbf7b173e00fcebc4f9fa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 15:56:11 +0800
Subject: [PATCH] 入库通知档和历史档增加mat_type物料类型，组托增加mat_type

---
 src/main/resources/mapper/LocMastMapper.xml |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 4cd1351..192e341 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -146,9 +146,30 @@
                     #{item}
                 </foreach>
                 and loc_sts = 'O'
+
+                <if test="rowBeg != null">
+                    and row1 >= #{rowBeg}
+                </if>
+                <if test="rowEnd != null">
+                    and row1 &lt;= #{rowEnd}
+                </if>
+                <if test="bayBeg != null">
+                    and bay1 >= #{bayBeg}
+                </if>
+                <if test="bayEnd != null">
+                    and bay1 &lt;= #{bayEnd}
+                </if>
+                <if test="levBeg != null">
+                    and lev1 >= #{levBeg}
+                </if>
+                <if test="levEnd != null">
+                    and lev1 &lt;= #{levEnd}
+                </if>
+
                 <if test="locType1 != null">
                     and loc_type1 = #{locType1}
                 </if>
+
                 <choose>
                     <when test="inoutEveryday != null and inoutEveryday">
                         AND bay1 &lt; 11 and lev1 in (3,4)
@@ -165,4 +186,102 @@
         )
     </select>
 
+    <select id="queryFreeLocMastEnd" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
+    <select id="queryFreeLocMastEnd1" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        <choose>
+            <when test="inoutEveryday != null and inoutEveryday">
+                AND bay1 &lt; 11             </when>
+            <otherwise>
+                AND bay1 >= 11
+            </otherwise>
+        </choose>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
+    <select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where bay1=#{bay}
+        and lev1=#{lev}
+--         and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        <if test="row1 >= 1 and row1 &lt;= 3">
+            and row1 >= 1 and row1 &lt;= 3
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 4 and row1 &lt;= 7">
+            and row1 >= 4 and row1 &lt;= 7
+            order by loc_sts desc ,row1 desc
+        </if>
+        <if test="row1 >= 8 and row1 &lt;= 11">
+            and row1 >= 8 and row1 &lt;= 11
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 12 and row1 &lt;= 14">
+            and row1 >= 12 and row1 &lt;= 14
+            order by loc_sts desc ,row1 desc
+        </if>
+        <if test="row1 >= 15 and row1 &lt;= 18">
+            and row1 >= 15 and row1 &lt;= 18
+            order by loc_sts desc ,row1 asc
+        </if>
+        <if test="row1 >= 19 and row1 &lt;= 21">
+            and row1 >= 19 and row1 &lt;= 21
+            order by loc_sts desc ,row1 desc
+        </if>
+    </select>
+
+    <select id="queryFreeLocMast2" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where 1=1
+        and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+
+        <if test="rowBeg != null">
+            and row1 >= #{rowBeg}
+        </if>
+        <if test="rowEnd != null">
+            and row1 &lt;= #{rowEnd}
+        </if>
+        <if test="bayBeg != null">
+            and bay1 >= #{bayBeg}
+        </if>
+        <if test="bayEnd != null">
+            and bay1 &lt;= #{bayEnd}
+        </if>
+        <if test="levBeg != null">
+            and lev1 >= #{levBeg}
+        </if>
+        <if test="levEnd != null">
+            and lev1 &lt;= #{levEnd}
+        </if>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
 </mapper>

--
Gitblit v1.9.1