From c0fc45a7cd97c2ded531b85575e6f26ff269db1b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 24 二月 2026 15:22:25 +0800
Subject: [PATCH] 第一次进场调试
---
src/main/resources/mapper/LocMastMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 62d7864..2774635 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,17 +45,18 @@
<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='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 top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O' and loc_type2 is null and lev1 in (3,4,5,6)
+ ORDER BY lev1 asc,bay1 asc
</select>
</mapper>
--
Gitblit v1.9.1