From 5ca198740a161c360c638b7a7587a69eb82d02e6 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 30 一月 2026 19:55:59 +0800
Subject: [PATCH] 库位转移

---
 src/main/resources/mapper/asrs/LocDetlMapper.xml |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index e25f55e..a93a652 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -51,6 +51,7 @@
         <result column="box_type2" property="boxType2" />
         <result column="box_type3" property="boxType3" />
         <result column="cstateid" property="cstateid" />
+        <result column="mk" property="mk" />
     </resultMap>
 
     <sql id="batchSeq">
@@ -351,7 +352,7 @@
             and a.anfme like '%' + #{anfme} + '%'
         </if>
         <if test="startTime!=null and endTime!=null">
-            and a.modi_time between #{startTime} and #{endTime}
+            and a.appe_time between #{startTime} and #{endTime}
         </if>
         <if test="crnNo!=null and crnNo!='' ">
             and b.crn_no=#{crnNo}
@@ -365,6 +366,14 @@
         <if test="standby1!=null and standby1!='' ">
             and a.standby1 like '%' + #{standby1} + '%'
         </if>
+        <if test="mk!=null and mk!='' ">
+            <if test='mk=="Y"'>
+                and b.mk='Y'
+            </if>
+            <if test='mk=="N"'>
+                and (b.mk!='Y' or b.mk is null)
+            </if>
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -372,7 +381,7 @@
         (
             select
             ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
-            a.*
+            a.*, b.mk
             from asr_loc_detl a
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
@@ -580,7 +589,7 @@
         </if>
 
         order by
-        a.loc_no, DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+        a.loc_no, DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time), a.anfme
         desc
     </select>
 
@@ -742,4 +751,17 @@
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
+    <select id="getSameDetlList" resultType="java.lang.String">
+        SELECT ld.loc_no FROM asr_loc_detl ld
+        LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+        WHERE 1 = 1
+        AND ld.matnr = #{matnr}
+        AND lm.loc_sts = 'F'
+        AND lm.row1 in
+        <foreach collection="rows" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        ORDER BY ld.appe_time ASC
+    </select>
+
 </mapper>

--
Gitblit v1.9.1