From cec95e176a9cfaa7661883f66dcebcc98a8b6449 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 十月 2025 10:14:32 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 62d7864..c82b853 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,7 +33,6 @@
         <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" />
 
     </resultMap>
@@ -46,16 +45,23 @@
         <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="queryDemoSourceLoc0" resultMap="BaseResultMap">
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+        and loc_sts='D' and row1 in (2,3,6,7)
+        ORDER BY NEWID()
     </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='D' and row1 in (1,4,5,8)
         ORDER BY NEWID()
     </select>
 
     <select id="queryDemoLoc" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
+        select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O' and row1 in (1,4,5,8)
         ORDER BY NEWID()
     </select>
 

--
Gitblit v1.9.1