From 4282d15a5e69a6b4c822c87d27a1ed6e7e618f00 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 02 七月 2025 13:29:12 +0800
Subject: [PATCH] 初始化1.0

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

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 62d7864..731751e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,8 +33,8 @@
         <result column="inv_wh" property="invWh" />
         <result column="mk" property="mk" />
         <result column="barcode" property="barcode" />
-        <result column="Pdc_type" property="PdcType" />
         <result column="ctn_no" property="ctnNo" />
+        <result column="status" property="status" />
 
     </resultMap>
 
@@ -46,17 +46,26 @@
         <if test="locType1 != null">
             and loc_type1 = #{locType1}
         </if>
-        order by loc_sts desc ,lev1 asc,bay1 asc
+        order by NEWID(),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')
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+        and loc_sts='F'
         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 NEWID()
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_type1 = #{locType1} and loc_sts = 'O' and (ctn_kind=0 or ctn_kind is null)
+        ORDER BY lev1 asc,bay1 asc
     </select>
 
+    <select id="selectByLocNo" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_no = #{locNo}
+    </select>
+
+    <select id="selectLocByLev" resultMap="BaseResultMap">
+        SELECT * FROM asr_loc_mast WHERE lev1 = #{lev}
+    </select>
 </mapper>

--
Gitblit v1.9.1