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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index e9c59a6..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">
@@ -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>
--
Gitblit v1.9.1