From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/resources/mapper/LocMastMapper.xml | 51 ++-------------------------------------------------
1 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index ba75efb..4141025 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -34,58 +34,11 @@
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
<result column="ctn_no" property="ctnNo" />
- <result column="group1" property="group1" />
- <result column="loc_attribute" property="locAttribute" />
</resultMap>
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
- 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 loc_sts desc ,lev1 asc,bay1 asc
- </select>
-
- <select id="queryShallowLocFMast" resultMap="BaseResultMap">
- select * from asr_loc_mast
- where 1=1
- and loc_no in (
- select
- concat(
- (
- case
- when left(loc_no, 2) = '01' then '02'
- when left(loc_no, 2) = '04' then '03'
- when left(loc_no, 2) = '05' then '06'
- when left(loc_no, 2) = '08' then '07'
- when left(loc_no, 2) = '09' then '10'
- when left(loc_no, 2) = '12' then '11'
- when left(loc_no, 2) = '13' then '14'
- when left(loc_no, 2) = '16' then '15'
- when left(loc_no, 2) = '17' then '18'
- when left(loc_no, 2) = '20' then '19'
- end)
- , right(loc_no, 5)) as shallowLocNo
- from asr_loc_mast
- where 1=1
- and loc_sts = 'O'
- and row1 in (1,4,5,8,9,12,13,16,17,20)
- )
- and (loc_sts = 'F' or loc_sts = 'D') and crn_no = #{crnNo}
- </select>
-
- <select id="querySame" resultMap="BaseResultMap">
- select l.* from asr_loc_mast l,asr_loc_detl d where 1=1
- and l.loc_no = d.loc_no
- and d.matnr = #{matnr}
- and l.lev1 = #{lev1}
- and l.loc_attribute = 1
- and l.loc_type1 = 1
- and l.loc_sts = 'F'
+ <select id="getLevList" resultType="integer">
+ select DISTINCT lev1 from asr_loc_mast
</select>
</mapper>
--
Gitblit v1.9.1