From 1f97a20465e29c4ae1824aa66408c77213812c40 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:38:18 +0800
Subject: [PATCH] #新增erp中间表库存同步功能

---
 src/main/resources/mapper/WrkDetlMapper.xml |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 0de341d..723ef49 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -53,7 +53,6 @@
         <result column="temp3" property="temp3" />
         <result column="pg_no" property="sPgNO" />
         <result column="pro_type" property="proType" />
-        <result column="auto_id" property="autoId" />
         <result column="out_order_no" property="outOrderNo" />
         <result column="lu_hao" property="luHao" />
         <result column="ware_id" property="wareId" />
@@ -96,10 +95,28 @@
         <include refid="batchSeq"></include>
     </update>
 
+    <select id="selectByOrderNo" resultMap="BaseResultMap">
+        SELECT d.*
+        FROM asr_wrk_detl d
+        WHERE order_no = #{orderNo}
+    </select>
+
     <select id="selectAndLogByOrderNo" resultMap="BaseResultMap">
-        select * from asr_wrk_detl where order_no = #{orderNo}
-        union
-        select * from asr_wrk_detl_log where order_no = #{orderNo}
+        SELECT
+            d.*
+        FROM
+            asr_wrk_detl d
+        WHERE
+            order_no = #{orderNo} UNION
+        SELECT
+            d.*
+        FROM
+            asr_wrk_detl_log d
+                JOIN asr_wrk_mast_log m ON d.wrk_no= m.wrk_no
+        WHERE
+            d.order_no = #{orderNo}
+          AND m.io_time= d.io_time
+          AND m.io_type!= 53
     </select>
 
     <update id="updateInspect">
@@ -147,5 +164,16 @@
         where 1=1
         and wrk_no = #{workNo}
     </update>
+    <resultMap id="PickInMap" type="com.zy.asrs.entity.param.PickInParam">
+        <result column="matnr" property="matnr" />
+        <result column="maktx" property="maktx" />
+        <result column="anfme" property="anfme" />
+        <result column="wrk_no" property="workNo"/>
+    </resultMap>
+    <select id="selectDetByBarcode" resultMap="PickInMap">
+        select matnr,maktx,anfme,wrk_no
+        from asr_wrk_detl
+        where zpallet = #{barcode}
+    </select>
 
 </mapper>

--
Gitblit v1.9.1