From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 61d8a3a..7821af2 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,12 +33,30 @@
         <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>
 
     <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'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        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='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 NEWID()
+    </select>
+
 </mapper>

--
Gitblit v1.9.1