From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index c641927..6e96cd2 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -35,21 +35,52 @@
         <result column="barcode" property="barcode" />
         <result column="Pdc_type" property="PdcType" />
         <result column="ctn_no" property="ctnNo" />
+        <result column="qr_code_value" property="qrCodeValue" />
 
     </resultMap>
 
     <select id="queryFreeLocMast" 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 top 1 *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        and row1 > 30
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        order by loc_sts desc ,lev1 asc,bay1 asc
     </select>
 
     <select id="queryDemoSourceLoc" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and (loc_sts='F' or loc_sts='D')
-        order by loc_sts desc ,lev1 asc, bay1 asc, row1 asc
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+        and loc_sts='D'
+        ORDER BY NEWID()
     </select>
 
     <select id="queryDemoLoc" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts='O'
-        order by loc_sts desc ,lev1 desc, bay1 desc, row1 desc
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
+        ORDER BY NEWID()
     </select>
 
+    <select id="queryByLoc" resultMap="BaseResultMap">
+        select top 1 * from asr_loc_mast where loc_no = #{locNo}
+    </select>
+
+    <select id="queryByQrCode" resultMap="BaseResultMap">
+        select top 1 * from asr_loc_mast where qr_code_value = #{qrCodeValue}
+    </select>
+
+    <select id="selectLocByLev" resultMap="BaseResultMap">
+        SELECT * FROM asr_loc_mast WHERE lev1 = #{lev}
+    </select>
+
+    <select id="selectEmptyLocNos" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_no in
+        <foreach item="loc" collection="locNos" index="index"  separator="," open="(" close=")">
+            #{loc}
+        </foreach>
+        and loc_sts = 'O'
+        order by row1
+    </select>
 </mapper>

--
Gitblit v1.9.1