From f4e1da85cc178df398200f49f099dac9bb94c60e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 四月 2021 09:53:37 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b2228fd..26dabee 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -6,12 +6,13 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
<result column="loc_no" property="locNo" />
<result column="matnr" property="matnr" />
- <result column="lgnum" property="lgnum" />
- <result column="tbnum" property="tbnum" />
- <result column="tbpos" property="tbpos" />
- <result column="zmatid" property="zmatid" />
<result column="maktx" property="maktx" />
- <result column="werks" property="werks" />
+ <result column="lgnum" property="lgnum" />
+ <result column="type" property="type" />
+ <result column="color" property="color" />
+ <result column="supplier" property="supplier" />
+ <result column="warehouse" property="warehouse" />
+ <result column="brand" property="brand" />
<result column="anfme" property="anfme" />
<result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
@@ -21,10 +22,30 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
-
</resultMap>
- <select id="getStockOutPage" parameterType="java.util.Map" resultMap="BaseResultMap">
+ <sql id="stockOutCondition">
+ <if test="loc_no!=null and loc_no!='' ">
+ and a.loc_no like '%' + #{loc_no} + '%'
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ and a.matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="maktx!=null and maktx!='' ">
+ and a.maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="anfme!=null and anfme!='' ">
+ and a.anfme like '%' + #{anfme} + '%'
+ </if>
+ <if test="altme!=null and altme!='' ">
+ and a.altme like '%' + #{altme} + '%'
+ </if>
+ <if test="startTime!=null and endTime!=null">
+ and a.modi_time between #{startTime} and #{endTime}
+ </if>
+ </sql>
+
+ <select id="getStockOutPage" resultMap="BaseResultMap">
select * from
(
select
@@ -33,10 +54,8 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_type = 'F'
- <if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
- </if>
+ and b.loc_sts = 'F'
+ <include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -46,6 +65,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_type = 'F'
+ and b.loc_sts = 'F'
+ <include refid="stockOutCondition"></include>
</select>
</mapper>
--
Gitblit v1.9.1