From 2e5837667e60378a06c7d8d1a4b095c4ba6e2d06 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 17 十一月 2025 09:29:08 +0800
Subject: [PATCH] 限制优化

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

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 61d8a3a..e68c81d 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.LocMastMapper">
+<mapper namespace="com.zy.mapper.LocMastMapper">
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
+    <resultMap id="BaseResultMap" type="com.zy.entity.LocMast">
         <id column="loc_no" property="locNo" />
         <result column="whs_type" property="whsType" />
         <result column="plt_type" property="pltType" />
@@ -33,12 +33,43 @@
         <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>
 
     <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_type2 = #{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='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="queryFreeLocMastNew" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="model != null">
+            and lev1 not in (11)
+        </if>
+        order by NEWID(),lev1 asc,bay1 asc
+    </select>
+    <select id="selectMatMatnrByMaktx" resultType="java.lang.String">
+        select model from man_mat where maktx  = #{maktx}
+    </select>
+
 </mapper>

--
Gitblit v1.9.1