From f140f8d9e17f4465f029134b008ec7f644b0e3db Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 14 十一月 2025 11:08:05 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml |   44 ++++----------------------------------------
 1 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2df399a..85017c4 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -5,68 +5,32 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
         <id column="loc_no" property="locNo" />
-        <result column="whs_type" property="whsType" />
-        <result column="plt_type" property="pltType" />
-        <result column="ctn_type" property="ctnType" />
         <result column="loc_sts" property="locSts" />
-        <result column="sheet_no" property="sheetNo" />
-        <result column="crn_no" property="crnNo" />
         <result column="row1" property="row1" />
         <result column="bay1" property="bay1" />
         <result column="lev1" property="lev1" />
-        <result column="full_plt" property="fullPlt" />
         <result column="loc_type" property="locType" />
         <result column="loc_type1" property="locType1" />
         <result column="loc_type2" property="locType2" />
         <result column="loc_type3" property="locType3" />
-        <result column="out_enable" property="outEnable" />
         <result column="io_time" property="ioTime" />
-        <result column="first_time" property="firstTime" />
         <result column="modi_user" property="modiUser" />
         <result column="modi_time" property="modiTime" />
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
         <result column="error_time" property="errorTime" />
         <result column="error_memo" property="errorMemo" />
-        <result column="ctn_kind" property="ctnKind" />
-        <result column="sc_weight" property="scWeight" />
-        <result column="inv_wh" property="invWh" />
-        <result column="mk" property="mk" />
-        <result column="barcode" property="barcode" />
-        <result column="ctn_no" property="ctnNo" />
         <result column="qr_code_value" property="qrCodeValue" />
+        <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'
-        and row1 > 30
-        <if test="locType1 != null">
-            and loc_type1 = #{locType1}
-        </if>
-        order by loc_sts desc ,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>
-
     <select id="queryByLoc" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where loc_no = #{locNo}
+        select * from asr_loc_mast where loc_no = #{locNo} limit 0,1
     </select>
 
     <select id="queryByQrCode" resultMap="BaseResultMap">
-        select top 1 * from asr_loc_mast where qr_code_value = #{qrCodeValue}
+        select * from asr_loc_mast where qr_code_value = #{qrCodeValue} limit 0,1
     </select>
 
     <select id="selectLocByLev" resultMap="BaseResultMap">
@@ -89,7 +53,7 @@
         <foreach item="loc" collection="locNos" index="index"  separator="," open="(" close=")">
             #{loc}
         </foreach>
-        and loc_sts != 'O'
+        and loc_sts not in ('O')
         order by row1
     </select>
 </mapper>

--
Gitblit v1.9.1