From 7ebe16b9abbee8e884db27d2ec360f17455b14f2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 09:03:07 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 89e1c85..6551419 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -5,15 +5,17 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<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="anfme" property="anfme" />
- <result column="altme" property="altme" />
+ <result column="mat_no" property="matNo" />
+ <result column="mat_name" property="matName" />
+ <result column="specs" property="specs" />
+ <result column="size" property="size" />
+ <result column="color" property="color" />
+ <result column="weight" property="weight" />
+ <result column="supplier" property="supplier" />
+ <result column="warehouse" property="warehouse" />
+ <result column="brand" property="brand" />
+ <result column="qty" property="qty" />
+ <result column="unit" property="unit" />
<result column="zpallet" property="zpallet" />
<result column="bname" property="bname" />
<result column="memo" property="memo" />
@@ -27,17 +29,17 @@
<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 test="mat_no!=null and mat_no!='' ">
+ and a.mat_no like '%' + #{mat_no} + '%'
</if>
- <if test="maktx!=null and maktx!='' ">
- and a.maktx like '%' + #{maktx} + '%'
+ <if test="mat_name!=null and mat_name!='' ">
+ and a.mat_name like '%' + #{mat_name} + '%'
</if>
- <if test="anfme!=null and anfme!='' ">
- and a.anfme like '%' + #{anfme} + '%'
+ <if test="qty!=null and qty!='' ">
+ and a.qty = #{qty}
</if>
<if test="altme!=null and altme!='' ">
- and a.altme like '%' + #{altme} + '%'
+ and a.unit like '%' + #{unit} + '%'
</if>
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
@@ -48,12 +50,12 @@
select * from
(
select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ ROW_NUMBER() over (order by a.appe_time,a.mat_no,a.loc_no) as row,
a.*
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>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -64,7 +66,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