From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码

---
 src/main/resources/mapper/OrderDetlMapper.xml |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 5d5fa60..89caf0e 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -8,11 +8,11 @@
         <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="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
         <result column="batch" property="batch" />
-
         <result column="specs" property="specs" />
         <result column="model" property="model" />
         <result column="color" property="color" />
@@ -39,14 +39,12 @@
         <result column="source" property="source" />
         <result column="inspect" property="inspect" />
         <result column="danger" property="danger" />
-
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
-
     </resultMap>
 
     <select id="selectItem" resultMap="BaseResultMap">
@@ -54,6 +52,7 @@
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
+        and status &lt; 3
         <choose>
             <when test="batch != null and batch != ''">
                 and batch = #{batch}
@@ -62,7 +61,16 @@
                 and (batch IS NULL OR batch = '')
             </otherwise>
         </choose>
+        <choose>
+            <when test="barcode != null and barcode != ''">
+                and barcode = #{barcode}
+            </when>
+            <otherwise>
+                and (barcode IS NULL OR barcode = '')
+            </otherwise>
+        </choose>
     </select>
+
 
     <select id="selectItemByOrderNo" resultMap="BaseResultMap">
         select * from man_order_detl
@@ -144,7 +152,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}
@@ -165,4 +173,49 @@
         and order_id = #{orderId}
     </update>
 
+    <insert id="addToLogTable">
+        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}
+        and barcode= #{barcode}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+    </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>
+        <choose>
+            <when test="barcode != null and barcode != ''">
+                and barcode = #{barcode}
+            </when>
+            <otherwise>
+                and (barcode IS NULL OR barcode = '')
+            </otherwise>
+        </choose>
+    </update>
+
 </mapper>

--
Gitblit v1.9.1