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/WrkDetlMapper.xml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index a9a84f2..b1af620 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -70,6 +70,9 @@
and matnr = #{matnr}
<include refid="batchSeq"></include>
</delete>
+ <delete id="deleteByWrkNo">
+ DELETE FROM asr_wrk_detl where wrk_no = #{wrkNo}
+ </delete>
<update id="updateAnfme">
update asr_wrk_detl
@@ -85,28 +88,31 @@
select awd.*
from asr_wrk_detl awd
left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
- where order_no = #{orderNo}
+ where order_no like '%' + #{orderNo} + '%'
union
select distinct awdl.*
from asr_wrk_detl_log awdl
left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
- where awdl.order_no = #{orderNo}
+ where awdl.order_no like '%' + #{orderNo} + '%'
and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
</select>
<select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
- select awd.wrk_no, awd.io_time, awd.matnr, sum(awd.anfme) as anfme
+ select awd.wrk_no, awd.io_time, awd.matnr, awd.order_no, sum(awd.anfme) as anfme
from asr_wrk_detl awd
left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no and awd.io_time = awm.io_time
- where order_no = #{orderNo}
- group by awd.wrk_no, awd.io_time, awd.matnr
+ where order_no like '%' + #{orderNo} + '%'
+ group by awd.wrk_no, awd.io_time, awd.matnr, awd.order_no
union
- select distinct awdl.wrk_no, awdl.io_time, awdl.matnr, sum(awdl.anfme) as anfme
- from asr_wrk_detl_log awdl
- left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
- where awdl.order_no = #{orderNo}
- and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
- group by awdl.wrk_no, awdl.io_time, awdl.matnr
+ select awdl.wrk_no, awdl.io_time, awdl.matnr, awdl.order_no, sum(awdl.anfme) as anfme from
+ (
+ select distinct awdl.*
+ from asr_wrk_detl_log awdl
+ left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
+ where awdl.order_no like '%' + #{orderNo} + '%'
+ and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
+ ) as awdl
+ group by awdl.wrk_no, awdl.io_time, awdl.matnr, awdl.order_no
</select>
<update id="updateInspect">
--
Gitblit v1.9.1