From 765570880aff1c8efb1dbd892e3372c9742ba6be Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 十二月 2022 15:56:03 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 36d335e..ff930ad 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -63,9 +63,8 @@
                     #{item}
                 </foreach>
                 and loc_sts = 'O'
-                <if test="locType1 != null">
-                    and loc_type1 = #{locType1}
-                </if>
+                and loc_no not in ('0100101', '0100201', '0100301')
+                and ctn_no != '00101'
                 group by ctn_no
             ) a
             where count = #{rowsLen}
@@ -73,4 +72,12 @@
         )
     </select>
 
+    <select id="queryFreeLocMast0" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
 </mapper>

--
Gitblit v1.9.1