From 518121d2718b87d99b12c1b29601dd2c07f6f42d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 15:03:14 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/asrs/WrkDetlMapper.xml |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/asrs/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
index 2d7e421..05991d2 100644
--- a/src/main/resources/mapper/asrs/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
@@ -51,6 +51,10 @@
         <result column="box_type1" property="boxType1" />
         <result column="box_type2" property="boxType2" />
         <result column="box_type3" property="boxType3" />
+        <result column="stock_num" property="stockNum" />
+        <result column="kp_cstmr_name" property="kpCstmrName" />
+        <result column="stock_num2" property="stockNum2" />
+        <result column="cstateid" property="cstateid" />
     </resultMap>
 
     <sql id="batchSeq">
@@ -87,10 +91,35 @@
         <include refid="batchSeq"></include>
     </update>
 
+    <update id="updateWeight">
+        update asr_wrk_detl
+        set weight = #{weight}
+        , modi_time = getdate()
+        where 1=1
+        and wrk_no = #{wrkNo}
+        and matnr = #{matnr}
+        <include refid="batchSeq"></include>
+    </update>
+
+    <update id="updateBarcode">
+        update asr_wrk_detl
+        set zpallet = #{barcode}
+        , modi_time = getdate()
+        where 1=1
+        and wrk_no = #{wrkNo}
+    </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 = #{orderNo} and awm.io_type != 103
         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 = #{orderNo} and awml.io_type != 103
+          and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
     </select>
 
     <update id="updateInspect">

--
Gitblit v1.9.1