From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/LocMastMapper.xml | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index c641927..19d8f6e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,23 +33,39 @@
<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>
<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='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="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