From f9e742b17c47d9f0df3a56caa09f18c8f99aa3f8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 03 七月 2025 17:44:37 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 74ebaf0..3a38e6c 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -45,6 +45,7 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
+        <result column="bom_code" property="bomCode" />
 
     </resultMap>
 
@@ -70,6 +71,22 @@
         and matnr = #{matnr}
         <if test="batch!=null and batch!='' ">
             and batch = #{batch}
+        </if>
+    </select>
+
+    <select id="selectItemByOrderNo2" resultMap="BaseResultMap">
+        select * from man_order_detl
+        where 1=1
+        and order_no = #{orderNo}
+        and matnr = #{matnr}
+        <if test="batch!=null and batch!='' ">
+            and batch = #{batch}
+        </if>
+        <if test="bomCode!=null and bomCode!='' ">
+            and bom_code = #{bomCode}
+        </if>
+        <if test="threeCode!=null and threeCode!='' ">
+            and three_code = #{threeCode}
         </if>
     </select>
 
@@ -124,15 +141,45 @@
         and mdt.pakout = 1
         <include refid="pakOutPageCondition"></include>
     </select>
+    <select id="checkAllDetlFinish" resultType="java.lang.Integer">
+        SELECT count(*) From man_order_detl WHERE qty &lt; anfme and order_no = #{orderNo}
+    </select>
+    <select id="sameOrderComb" resultType="java.lang.Integer">
+        SELECT SUM(anfme) FROM cust_wait_pakin WHERE  1=1
+        <if test="orderNo!=null and orderNo!='' ">
+            and order_no like '%' + #{orderNo} + '%'
+        </if>
+        and matnr = #{matnr}
+        <choose>
+            <when test="batch != null and batch!=''  ">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+    </select>
+    <select id="selectCountToAsrByMatnr" resultType="java.lang.Long">
+        SELECT ISNULL(SUM(anfme), 0) FROM asr_loc_detl WHERE matnr = #{matnr}
+        <if test="batch!=null and batch!='' ">
+            and batch = #{batch}
+        </if>
+    </select>
+    <select id="selectCountToManByMatnr" resultType="java.lang.Long">
+        SELECT ISNULL(SUM(anfme), 0) FROM man_loc_detl WHERE matnr = #{matnr}
+        <if test="batch!=null and batch!='' ">
+            and batch = #{batch}
+        </if>
+    </select>
 
     <update id="increase">
         update man_order_detl
-        set qty = qty + #{qty}
+        set work_qty = work_qty + #{qty}
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
         <choose>
-            <when test="batch != null and batch != ''">
+            <when test="batch != null and batch!=''  ">
                 and batch = #{batch}
             </when>
             <otherwise>
@@ -148,11 +195,11 @@
         and order_no = #{orderNo}
         and matnr = #{matnr}
         <choose>
-            <when test="batch != null and batch != ''">
+            <when test="batch != null ">
                 and batch = #{batch}
             </when>
             <otherwise>
-                and (batch IS NULL OR batch = '')
+                and (batch IS NULL )
             </otherwise>
         </choose>
     </update>
@@ -184,6 +231,38 @@
         </choose>
     </update>
 
+    <update id="increaseQtyByOrderNo2">
+        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>
+        <choose>
+            <when test="bomCode != null and bomCode != ''">
+                and bom_code = #{bomCode}
+            </when>
+            <otherwise>
+                and (bom_code IS NULL OR bom_code = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="threeCode != null and threeCode != ''">
+                and three_code = #{threeCode}
+            </when>
+            <otherwise>
+                and (three_code IS NULL OR three_code = '')
+            </otherwise>
+        </choose>
+    </update>
+
     <update id="increaseWorkQty">
         update man_order_detl
         set work_qty = work_qty + #{workQty}
@@ -200,4 +279,90 @@
         </choose>
     </update>
 
+    <update id="increaseWorkQty2">
+        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="bomCode != null and bomCode != ''">
+                and bom_code = #{bomCode}
+            </when>
+            <otherwise>
+                and (bom_code IS NULL OR bom_code = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="threeCode != null and threeCode != ''">
+                and three_code = #{threeCode}
+            </when>
+            <otherwise>
+                and (three_code IS NULL OR three_code = '')
+            </otherwise>
+        </choose>
+    </update>
+
+    <update id="increaseAnfme">
+        update man_order_detl
+        set anfme = anfme + #{qty}
+        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>
+    </update>
+
+    <update id="increaseAnfme2">
+        update man_order_detl
+        set anfme = anfme + #{qty}
+        where 1=1
+        and order_id = #{orderId}
+        and matnr = #{matnr}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <when test="bumNum != null and bumNum != ''">
+                and bom_code = #{bumNum}
+            </when>
+            <when test="threeCode != null and threeCode != ''">
+                and three_code = #{threeCode}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+    </update>
+
+    <update id="increaseWorkQtyByOrderNo">
+        update man_order_detl
+        set 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>
+    </update>
+
 </mapper>

--
Gitblit v1.9.1