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 | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 225f31e..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
@@ -82,9 +85,34 @@
</update>
<select id="selectAndLogByOrderNo" resultMap="BaseResultMap">
- select * from asr_wrk_detl where order_no = #{orderNo}
+ 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 like '%' + #{orderNo} + '%'
union
- select * from asr_wrk_detl_log where order_no = #{orderNo}
+ 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 != '鎵嬪姩鍙栨秷')
+ </select>
+
+ <select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
+ 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 like '%' + #{orderNo} + '%'
+ group by awd.wrk_no, awd.io_time, awd.matnr, awd.order_no
+ union
+ 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">
@@ -108,4 +136,14 @@
and awd.matnr + '-' + awd.batch = #{matnr}
</select>
+ <update id="updateOrderNo">
+ update asr_wrk_detl
+ set order_no = #{orderNo}
+ , modi_time = getdate()
+ where 1=1
+ and wrk_no = #{wrkNo}
+ and matnr = #{matnr}
+ <include refid="batchSeq"></include>
+ </update>
+
</mapper>
--
Gitblit v1.9.1