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 | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 260adc0..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">
@@ -70,6 +72,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 +87,65 @@
</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">
+ update asr_wrk_detl
+ set inspect = 1
+ where 1=1
+ and wrk_no = #{wrkNo}
+ and matnr = #{matnr}
+ <include refid="batchSeq"></include>
+ </update>
+
+ <select id="selectPakoutQuery" resultMap="BaseResultMap">
+ select
+ awd.*
+ from asr_wrk_detl awd
+ left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no
+ where 1=1
+ and awm.wrk_sts = 14
+ and (awd.inspect is null or awd.inspect = 0)
+ and awm.sta_no = #{staNo}
+ 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