From fcc38f90f19b5dd09bac80cfa3069817c6243acb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 11 十二月 2025 09:37:50 +0800
Subject: [PATCH] #1
---
src/main/resources/mapper/LocMastMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 62d7864..4361479 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,29 @@
<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="queryFreeLocMast2" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_loc_mast
+ where row1=#{row}
+ and loc_sts='O'
+ and bay1 != #{bay}
+ <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='F' or loc_sts='D')
+ 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'
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O' and loc_type1 = #{locType1}
ORDER BY NEWID()
</select>
--
Gitblit v1.9.1