From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造

---
 src/main/resources/mapper/LocMastMapper.xml |  145 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index c641927..c94c129 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -4,52 +4,125 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <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="Pdc_type" property="PdcType" />
-        <result column="ctn_no" property="ctnNo" />
+        <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="INV_WH" property="invWh" />
+        <result column="PDC_TYPE" property="PdcType" />
+        <result column="BARCODE" property="barcode" />
+        <result column="CTN_NO" property="ctnNo" />
+        <result column="CONTAINER_CODE" property="containerCode" />
+        <result column="CONTAINER_TYPE_CODE" property="containerTypeCode" />
+        <result column="EMPTY_CONTAINER" property="emptyContainer" />
 
     </resultMap>
 
+    <sql id="batchSeq">
+        <if test="locSts != null and locSts != ''">
+            and LOC_STS = #{locSts}
+        </if>
+        <if test="locNo != null and locNo != ''">
+            and LOC_NO = #{locNo}
+        </if>
+        <if test="whsType != null and whsType != 0">
+            and WHS_TYPE = #{whsType}
+        </if>
+        <if test="crnNo != null and crnNo != 0">
+            and CRN_NO = #{crnNo}
+        </if>
+        <if test="row1 != null and row1 != 0">
+            and ROW1 = #{row1}
+        </if>
+        <if test="bay1 != null and bay1 != 0">
+            and BAY1 = #{bay1}
+        </if>
+        <if test="lev1 != null and lev1 != 0">
+            and LEV1 = #{lev1}
+        </if>
+    </sql>
+
+    <select id="selectLocMastListSix" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."asr_loc_mast"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+    </select>
+
+    <select id="selectLocMastListTotalSix" resultType="Long">
+        SELECT count(1) FROM "SOURCE"."asr_loc_mast"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+    </select>
+
+    <select id="selectLocMastList" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."asr_loc_mast"
+        WHERE 1=1
+        <if test="locNo != null and locNo != ''">
+            and LOC_NO like '%' + #{locNo} + '%'
+        </if>
+        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+    </select>
+
+    <select id="selectLocMastListTotal" resultType="Long">
+        SELECT count(1) FROM "SOURCE"."asr_loc_mast"
+        WHERE 1=1
+        <if test="locNo != null and locNo != ''">
+            and LOC_NO like '%' + #{locNo} + '%'
+        </if>
+    </select>
+
     <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 "SOURCE"."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 "SOURCE"."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 "SOURCE"."asr_loc_mast" where "CRN_NO" = #{crnNo} and "LOC_STS" = 'O'
+        ORDER BY NEWID()
     </select>
 
+    <select id="selectByLocNo" resultMap="BaseResultMap">
+        select * from "SOURCE"."asr_loc_mast"
+        where "LOC_NO" = #{locNo}
+    </select>
+
+    <select id="selectLocByLev" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."asr_loc_mast" WHERE "LEV1" = #{lev}
+    </select>
 </mapper>

--
Gitblit v1.9.1