From ebd793bbc910b095aaa15d9e733324bbeb8b94a9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 12 一月 2026 08:13:08 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/WrkDetlMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index fbdfeef..07529e6 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -45,6 +45,8 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="mat_type" property="matType" />
+ <result column="owner" property="owner" />
</resultMap>
<sql id="batchSeq">
@@ -69,6 +71,9 @@
and wrk_no = #{wrkNo}
and matnr = #{matnr}
<include refid="batchSeq"></include>
+ </delete>
+ <delete id="deleteByWrkNo">
+ DELETE FROM asr_wrk_detl where wrk_no = #{wrkNo}
</delete>
<update id="updateAnfme">
@@ -95,18 +100,21 @@
</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 like '%' + #{orderNo} + '%'
- group by awd.wrk_no, awd.io_time, awd.matnr
+ 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 like '%' + #{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