From b141c90208b6a82504680d35eacdaecff1cb7e40 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 14 四月 2024 10:39:43 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkDetlMapper.xml |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 22e22ef..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">
@@ -61,6 +63,10 @@
 
     <select id="selectByWrkNo" resultMap="BaseResultMap">
         select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
+    </select>
+
+    <select id="selectByWrkNoUnstacking" resultMap="BaseResultMap">
+        select * from asr_wrk_detl where 1=1 and inspect=0 and wrk_no = #{wrkNo}
     </select>
 
     <delete id="deleteItem">
@@ -103,8 +109,32 @@
         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>
 
+    <select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultMap="BaseResultMap">
+        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,awd.batch,awd.source
+        union
+        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,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