From 6cd08fe4de88df0a21851f96bdc4e617c5d92e36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 29 四月 2026 11:57:31 +0800
Subject: [PATCH] 工单相关功能完善

---
 src/main/resources/mapper/OrderDetlPakoutMapper.xml |   88 ++++++++++++++++++++-----------------------
 1 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 11d6df5..ff499b1 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -28,7 +28,7 @@
         <result column="item_num" property="itemNum" />
         <result column="safe_qty" property="safeQty" />
         <result column="weight" property="weight" />
-        <result column="length" property="length" />
+        <result column="man_length" property="manLength" />
         <result column="volume" property="volume" />
         <result column="three_code" property="threeCode" />
         <result column="supp" property="supp" />
@@ -45,22 +45,37 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
-
+        <result column="pakin_pakout_status" property="pakinPakoutStatus" />
+        <result column="line_number" property="lineNumber" />
+        <result column="standby1" property="standby1" />
+        <result column="standby2" property="standby2" />
+        <result column="standby3" property="standby3" />
+        <result column="box_type1" property="boxType1" />
+        <result column="box_type2" property="boxType2" />
+        <result column="box_type3" property="boxType3" />
     </resultMap>
+
+    <sql id="standbyAll">
+        and batch = #{batch}
+        and brand = #{brand}
+        and standby1 = #{standby1}
+        and standby2 = #{standby2}
+        and standby3 = #{standby3}
+        and box_type1 = #{boxType1}
+        and box_type2 = #{boxType2}
+        and box_type3 = #{boxType3}
+    </sql>
+    <sql id="standbyAllMemo">
+        --         and line_number = #{lineNumber}
+        --         and specs = #{specs}
+    </sql>
 
     <select id="selectItem" resultMap="BaseResultMap">
         select * from man_order_detl_pakout
         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>
+        <include refid="standbyAll"></include>
     </select>
 
     <select id="selectItemByOrderNo" resultMap="BaseResultMap">
@@ -68,9 +83,7 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null and batch!='' ">
-            and batch = #{batch}
-        </if>
+        <include refid="standbyAll"></include>
     </select>
 
     <select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -124,6 +137,15 @@
         and mdt.pakout = 1
         <include refid="pakOutPageCondition"></include>
     </select>
+    <select id="selectReportComplete" resultType="java.lang.Integer">
+        SELECT
+            CASE
+                WHEN COUNT(*) = SUM(CASE WHEN anfme = units THEN 1 ELSE 0 END) THEN 1
+                ELSE 0
+                END
+        FROM man_order_detl_pakout
+        WHERE order_id = #{orderId}
+    </select>
 
     <update id="increase">
         update man_order_detl_pakout
@@ -131,14 +153,7 @@
         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>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="decrease">
@@ -147,14 +162,7 @@
         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>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="modifyStatus">
@@ -165,23 +173,16 @@
     </update>
 
     <insert id="addToLogTable">
-        INSERT INTO man_order_detl_log SELECT * FROM man_order_detl_pakout WHERE id = #{id}
+        INSERT INTO man_order_detl_log_pakout SELECT * FROM man_order_detl_pakout WHERE id = #{id}
     </insert>
 
     <update id="increaseQtyByOrderNo">
         update man_order_detl_pakout
-        set qty = qty + #{qty}
+        set qty = qty + #{qty},work_qty = work_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>
+        <include refid="standbyAll"></include>
     </update>
 
     <update id="increaseWorkQty">
@@ -190,14 +191,7 @@
         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>
+        <include refid="standbyAll"></include>
     </update>
 
 </mapper>

--
Gitblit v1.9.1