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 |   93 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 260adc0..723ef49 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -45,6 +45,20 @@
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
         <result column="memo" property="memo" />
+
+
+        <result column="i_no" property="iNo" />
+        <result column="temp1" property="temp1" />
+        <result column="temp2" property="temp2" />
+        <result column="temp3" property="temp3" />
+        <result column="pg_no" property="sPgNO" />
+        <result column="pro_type" property="proType" />
+        <result column="out_order_no" property="outOrderNo" />
+        <result column="lu_hao" property="luHao" />
+        <result column="ware_id" property="wareId" />
+        <result column="ware_mame" property="wareName" />
+        <result column="packing" property="packing" />
+
     </resultMap>
 
     <sql id="batchSeq">
@@ -81,10 +95,85 @@
         <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}
+        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">
+        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>
+
+    <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
+        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
         union
-        select * from asr_wrk_detl_log where order_no = #{orderNo}
+        select distinct awdl.wrk_no, awdl.io_time, awdl.matnr,awdl.zpallet,awdl.specs,awdl.maktx, 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
+    </select>
+
+
+
+    <update id="updateIoTimeWms">
+        update asr_wrk_detl
+        set io_time = #{ioTime}
+        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