From 1e6b4d88290ccd79b51bed3acb805750a0ea7d01 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:25:23 +0800
Subject: [PATCH] 记录输送线异常日志

---
 src/main/resources/mapper/OrderDetlMapper.xml |   97 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 5d5fa60..f18898e 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" />
@@ -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" />
@@ -39,29 +39,44 @@
         <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" />
+        <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
         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">
@@ -69,9 +84,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">
@@ -132,19 +145,50 @@
         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">
         update man_order_detl
-        set qty = qty - #{qty}
+        set work_qty = work_qty - #{qty}
+        where 1=1
+        and order_no = #{orderNo}
+        and matnr = #{matnr}
+        <include refid="standbyAll"></include>
+    </update>
+
+    <update id="modifyStatus">
+        update man_order_detl
+        set status = #{status}
+        where 1=1
+        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}
+        <include refid="standbyAll"></include>
+    </update>
+
+    <update id="increaseWorkQty">
+        update man_order_detl
+        set work_qty = work_qty + #{workQty}
+        where 1=1
+        and order_id = #{orderId}
+        and matnr = #{matnr}
+        <include refid="standbyAll"></include>
+    </update>
+
+    <update id="increaseWorkQtyByOrderNo">
+        update man_order_detl
+        set work_qty = work_qty + #{qty}
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
@@ -156,13 +200,6 @@
                 and (batch IS NULL OR batch = '')
             </otherwise>
         </choose>
-    </update>
-
-    <update id="modifyStatus">
-        update man_order_detl
-        set status = #{status}
-        where 1=1
-        and order_id = #{orderId}
     </update>
 
 </mapper>

--
Gitblit v1.9.1