From 64126dfd00ed90af484fbf7b173e00fcebc4f9fa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 15:56:11 +0800
Subject: [PATCH] 入库通知档和历史档增加mat_type物料类型，组托增加mat_type
---
src/main/resources/mapper/LocDetlMapper.xml | 365 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 284 insertions(+), 81 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..e88f471 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -78,6 +78,8 @@
update asr_loc_detl
set anfme = #{anfme}
, modi_time = getdate()
+ , manu = #{manu}
+ , memo = #{memo}
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
@@ -94,19 +96,44 @@
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
</if>
+ <if test="specs!=null and specs!='' ">
+ and a.specs like '%' + #{specs} + '%'
+ </if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
+ </if>
+ <if test="zpallet!=null and zpallet!='' ">
+ and a.zpallet like '%' + #{zpallet} + '%'
+ </if>
+ <if test="manu!=null and manu!='' ">
+ and a.manu like '%' + #{manu} + '%'
</if>
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
</sql>
+ <sql id="groupListCondition">
+ <if test="matnr!=null and matnr!='' ">
+ and matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="maktx!=null and maktx!='' ">
+ and maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ and specs like '%' + #{specs} + '%'
+ </if>
+ <if test="batch!=null and batch!='' ">
+ and batch like '%' + #{batch} + '%'
+ </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.loc_no,a.appe_time,a.matnr) as row,
a.*
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
@@ -140,6 +167,21 @@
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
+ <select id="getStockStatis2" resultType="com.zy.asrs.entity.LocDetl">
+ select * from
+ (
+ select
+ ROW_NUMBER() over (order by sum(a.anfme),a.batch desc) as row
+ , a.matnr
+ , a.batch
+ , sum(a.anfme) as anfme
+ from asr_loc_detl a
+ where 1=1
+ <include refid="stockOutCondition"></include>
+ group by a.matnr,a.batch
+ ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
<select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select count(1) as count from
(
@@ -157,9 +199,10 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.specs
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr, a.specs
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
@@ -192,91 +235,219 @@
select count(*) from asr_loc_detl where loc_no = #{loc_no}
</select>
+ <select id="queryStockPre" resultType="com.zy.common.model.QueryStockPreDo">
+ select
+ *
+ from
+ (
+ select
+ no = 1,
+ orderBy = 'false',
+ b.bay1 as bay,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 1
+ and b.row1 <= 3
+ group by b.bay1
+ union
+ select
+ no = 2,
+ orderBy = 'true',
+ b.bay1,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 4
+ and b.row1 <= 7
+ group by b.bay1
+ union
+ select
+ no = 3,
+ orderBy = 'false',
+ b.bay1,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 8
+ and b.row1 <= 11
+ group by b.bay1
+ union
+ select
+ no = 4,
+ orderBy = 'true',
+ b.bay1,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 12
+ and b.row1 <= 14
+ group by b.bay1
+ union
+ select
+ no = 5,
+ orderBy = 'false',
+ b.bay1,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 15
+ and b.row1 <= 18
+ group by b.bay1
+ union
+ select
+ no = 6,
+ orderBy = 'true',
+ b.bay1,
+ sum(anfme) as count
+ 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 b.frozen != 1
+ and a.manu is null
+ and a.matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.row1 >= 19
+ and b.row1 <= 21
+ group by b.bay1
+ ) a
+ order by count desc
+ </select>
+
<select id="queryStock" resultMap="BaseResultMap">
- select a.*
+ 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
+ (
+ (b.row1 = 0)
+ <if test="no!=null and no == 1">
+ or
+ (
+ b.row1 >= 1
+ and b.row1 <= 3
+ )
+ </if>
+ <if test="no!=null and no == 2">
+ or
+ (
+ b.row1 >= 4
+ and b.row1 <= 7
+ )
+ </if>
+ <if test="no!=null and no == 3">
+ or
+ (
+ b.row1 >= 8
+ and b.row1 <= 11
+ )
+ </if>
+ <if test="no!=null and no == 4">
+ or
+ (
+ b.row1 >= 12
+ and b.row1 <= 14
+ )
+ </if>
+ <if test="no!=null and no == 5">
+ or
+ (
+ b.row1 >= 15
+ and b.row1 <= 18
+ )
+ </if>
+ <if test="no!=null and no == 6">
+ or
+ (
+ b.row1 >= 19
+ and b.row1 <= 21
+ )
+ </if>
+ )
and a.matnr = #{matnr}
-<!-- <choose>-->
-<!-- <when test="batch != null and batch != ''">-->
-<!-- and a.batch = #{batch}-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- and (a.batch IS NULL OR a.batch = '')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
- <if test="batch != null and batch != ''">
- and a.batch = #{batch}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
+ and b.bay1 = #{bay}
+ and b.loc_sts = 'F' and b.frozen != 1
+ order by b.row1
+ <if test="orderBy != null and orderBy != '' and orderBy == 'false'">
+ desc
</if>
- <if test="orderNo != null and orderNo != ''">
- and a.orderNo = #{orderNo}
- </if>
-
- <if test="locNos != null and locNos.size > 0">
- and b.loc_no not in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
-
- order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
- NEWID(),
- case
- when (left(a.loc_no, 2) = '01') then 0
- when (left(a.loc_no, 2) = '02') then 1
- when (left(a.loc_no, 2) = '03') then 1
- when (left(a.loc_no, 2) = '04') then 0
- when (left(a.loc_no, 2) = '05') then 0
- when (left(a.loc_no, 2) = '06') then 1
- when (left(a.loc_no, 2) = '07') then 1
- when (left(a.loc_no, 2) = '08') then 0
- when (left(a.loc_no, 2) = '09') then 0
- when (left(a.loc_no, 2) = '10') then 1
- when (left(a.loc_no, 2) = '11') then 1
- when (left(a.loc_no, 2) = '12') then 0
- when (left(a.loc_no, 2) = '13') then 0
- when (left(a.loc_no, 2) = '14') then 1
- when (left(a.loc_no, 2) = '15') then 1
- when (left(a.loc_no, 2) = '16') then 0
- when (left(a.loc_no, 2) = '17') then 0
- when (left(a.loc_no, 2) = '18') then 1
- when (left(a.loc_no, 2) = '19') then 1
- when (left(a.loc_no, 2) = '20') then 0
- when (left(a.loc_no, 2) = '21') then 0
- when (left(a.loc_no, 2) = '22') then 1
- when (left(a.loc_no, 2) = '23') then 1
- when (left(a.loc_no, 2) = '24') then 0
- when (left(a.loc_no, 2) = '25') then 0
- when (left(a.loc_no, 2) = '26') then 1
- when (left(a.loc_no, 2) = '27') then 1
- when (left(a.loc_no, 2) = '28') then 0
- when (left(a.loc_no, 2) = '29') then 0
- when (left(a.loc_no, 2) = '30') then 1
- when (left(a.loc_no, 2) = '31') then 1
- when (left(a.loc_no, 2) = '32') then 0
- when (left(a.loc_no, 2) = '33') then 0
- when (left(a.loc_no, 2) = '34') then 1
- when (left(a.loc_no, 2) = '35') then 1
- when (left(a.loc_no, 2) = '36') then 0
- when (left(a.loc_no, 2) = '37') then 0
- when (left(a.loc_no, 2) = '38') then 1
- when (left(a.loc_no, 2) = '39') then 1
- when (left(a.loc_no, 2) = '40') then 0
- when (left(a.loc_no, 2) = '41') then 0
- when (left(a.loc_no, 2) = '42') then 1
- when (left(a.loc_no, 2) = '43') then 1
- when (left(a.loc_no, 2) = '44') then 0
- when (left(a.loc_no, 2) = '45') then 0
- when (left(a.loc_no, 2) = '46') then 1
- when (left(a.loc_no, 2) = '47') then 1
- when (left(a.loc_no, 2) = '48') then 0
- else 0
- end
- desc
</select>
<select id="queryStockAnfme" resultType="java.lang.Double">
@@ -310,5 +481,37 @@
batch LIKE '%[a-z]%'
</select>
+ <select id="selectSameDetl" 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
+ LEFT JOIN (
+ select
+ loc_no,
+ count(1) as count
+ from asr_loc_detl
+ where 1=1
+ group by loc_no
+ ) dual on dual.loc_no = lm.loc_no
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND (lm.row1 >= #{start} AND lm.row1 <= #{end})
+ AND (lm.loc_sts = 'F')
+ AND dual.count = 1
+ ORDER BY lm.modi_time ASC
+ </select>
+ <select id="selectSumByMatnr" resultType="java.lang.Double">
+ select sum(anfme) FROM asr_loc_detl WHERE matnr = #{matnr}
+ </select>
+ <select id="selectGroupPage" resultMap="BaseResultMap" parameterType="java.util.Map">
+
+ SELECT * FROM [dbo].[asr_loc_detl_group] WHERE 1 = 1
+ <include refid="groupListCondition"></include>
+ </select>
+ <select id="selectByLocNo" resultMap="BaseResultMap">
+ SELECT * FROM asr_loc_detl WHERE loc_no = #{locNo}
+
+ </select>
</mapper>
--
Gitblit v1.9.1