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/OrderDetlMapper.xml |   88 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index b8e55d7..bddb24f 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -46,6 +46,29 @@
         <result column="update_time" property="updateTime" />
         <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="auto_id" property="autoId" />
+        <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" />
+        <result column="det_id" property="detId"/>
+    </resultMap>
+    <resultMap id="AcResultMap" type="com.zy.asrs.entity.AcQuantity">
+        <result column="order_id" property="orderId" />
+        <result column="order_no" property="orderNo" />
+        <result column="anfme" property="anfme" />
+        <result column="work_qty" property="workQty" />
+        <result column="qty" property="qty" />
+        <result column="maktx" property="maktx" />
+        <result column="model" property="model" />
+
     </resultMap>
 
     <select id="selectItem" resultMap="BaseResultMap">
@@ -68,9 +91,14 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null and batch!='' ">
-            and batch = #{batch}
-        </if>
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -78,6 +106,11 @@
         where 1=1
         and order_id = #{orderId}
         and qty &lt; anfme
+    </select>
+
+    <select id="loadQuantity" resultMap="AcResultMap">
+        select order_id,order_no,model,maktx,anfme,qty,work_qty from man_order_detl
+        where  order_no = #{orderNo}
     </select>
 
     <sql id="pakOutPageCondition">
@@ -143,7 +176,7 @@
 
     <update id="decrease">
         update man_order_detl
-        set qty = qty - #{qty}
+        set work_qty = work_qty - #{qty}
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
@@ -157,6 +190,13 @@
         </choose>
     </update>
 
+    <update id="decrease2">
+        update man_order_detl
+        set work_qty = work_qty - #{qty}
+        where 1=1
+        and id = #{id}
+    </update>
+
     <update id="modifyStatus">
         update man_order_detl
         set status = #{status}
@@ -168,20 +208,40 @@
         INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
     </insert>
 
+<!--    <update id="increaseQtyByOrderNo">-->
+<!--        update man_order_detl-->
+<!--        set qty = qty + #{qty}-->
+<!--        where 1=1-->
+<!--        and order_no = #{orderNo}-->
+<!--        and matnr = #{matnr}-->
+<!--        <choose>-->
+<!--            <when test="batch != null and batch != ''">-->
+<!--                and batch = #{batch}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and (batch IS NULL OR batch = '')-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+<!--    </update>-->
+
+    <update id="increaseQtyById">
+        update man_order_detl
+        set qty = qty + #{qty}
+        where 1=1
+        and id = #{id}
+    </update>
+
     <update id="increaseWorkQty">
         update man_order_detl
         set work_qty = work_qty + #{workQty}
         where 1=1
-        and order_id = #{orderId}
-        and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        and id = #{id}
     </update>
 
+
+    <select id="listByOrderNo" resultMap="BaseResultMap">
+        select * from man_order_detl
+        where 1=1
+        and order_no = #{orderNo}
+    </select>
 </mapper>

--
Gitblit v1.9.1