From 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:46:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/resources/mapper/LocDetlMapper.xml | 94 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index b2228fd..14d0369 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" />
@@ -21,22 +23,40 @@
<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="mat_no!=null and mat_no!='' ">
+ and a.mat_no like '%' + #{mat_no} + '%'
+ </if>
+ <if test="mat_name!=null and mat_name!='' ">
+ and a.mat_name like '%' + #{mat_name} + '%'
+ </if>
+ <if test="qty!=null and qty!='' ">
+ and a.qty = #{qty}
+ </if>
+ <if test="altme!=null and altme!='' ">
+ and a.unit like '%' + #{unit} + '%'
+ </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
- 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'
- <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 +66,46 @@
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>
+
+ <select id="selectLocDetlList" resultMap="BaseResultMap">
+ select 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_sts = 'F' and a.mat_no= #{mat_no}
+ order by a.appe_time
+ </select>
+ <select id="selectLocDetlSumQty" resultType="double">
+ select SUM(qty) qty
+ from asr_loc_detl
+ where loc_no=#{locNo}
+ </select>
+ <select id="getStockStatis" resultMap="BaseResultMap">
+ select a.mat_name,a.mat_no,sum(a.qty) qty from
+ (
+ select
+ ROW_NUMBER() over (order by c.appe_time,c.mat_no,c.loc_no) as row,
+ c.*
+ from asr_loc_detl c
+ ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ <include refid="stockOutCondition"></include>
+ group by a.mat_no,a.mat_name
+ </select>
+ <select id="getStockStatisCount" resultType="integer">
+ select
+ count(1)
+ from asr_loc_detl a
+ </select>
+ <select id="getStockStatisExcel" resultMap="BaseResultMap">
+ select
+ ROW_NUMBER() over (order by a.mat_no, sum(a.qty) desc) as row
+ , a.mat_no, a.mat_name
+ , sum(a.qty) as qty
+ from asr_loc_detl a
+ where 1=1
+ group by a.mat_no,a.mat_name
</select>
</mapper>
--
Gitblit v1.9.1