From 86b35ee3af5f587bf3194805806e5e2fafaf4a70 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 21 十月 2024 11:59:21 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 0888893..95881a1 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="roll_up" property="rollUp" />
+
</resultMap>
<sql id="batchSeq">
@@ -113,19 +115,26 @@
</select>
<select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
- select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs,awd.maktx, sum(awd.anfme) as anfme
+ select awd.wrk_no, awd.io_time, awd.matnr,awd.zpallet,awd.specs,awd.maktx,awd.batch,awd.source, 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 ,awd.zpallet,awd.specs,awd.maktx
+ group by awd.wrk_no, awd.io_time, awd.matnr ,awd.zpallet,awd.specs,awd.maktx,awd.batch,awd.source
union
- select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs,awdl.maktx, sum(awdl.anfme) as anfme
+ select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs,awdl.maktx,awdl.batch,awdl.source, 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 != '鎵嬪姩鍙栨秷')
and awml.io_type != 103
- group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx
+ group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx,awdl.batch,awdl.source
</select>
+ <update id="updateIoTimeWms">
+ update asr_wrk_detl
+ set io_time = #{ioTime}
+ where 1=1
+ and wrk_no = #{workNo}
+ </update>
+
</mapper>
--
Gitblit v1.9.1