From a1db2ea6ccdafdffdf2ed4e52844179e72dc77a5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 20 一月 2026 10:25:09 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml |  112 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 982dd31..9a5b3a3 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -102,52 +102,128 @@
         order by row1 desc
     </select>
 
+<!--    <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts not in ('O') order by row1-->
+<!--    </select>-->
+
     <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts not in ('O') order by row1
     </select>
 
+<!--    <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts not in ('O') order by row1 desc-->
+<!--    </select>-->
     <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts not in ('O') order by row1 desc
     </select>
-
+<!--    <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts in ('O') order by row1 desc-->
+<!--    </select>-->
     <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts in ('O') order by row1 desc
     </select>
-
+<!--    <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts in ('O') order by row1-->
+<!--    </select>-->
     <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts in ('O') order by row1
     </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>
+            order by loc_sts desc ,row1 desc,lev1 asc,bay1 asc
+        </select>
+
+    <select id="getLevList" resultType="integer">
+        select distinct lev1 from asr_loc_mast order by lev1
+    </select>
 </mapper>

--
Gitblit v1.9.1