From b2cefd84dfd1aa051ae4ab342874fbafef74ab3b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 13:19:59 +0800
Subject: [PATCH] 修改补片打印筛选

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index fa3794b..fa6bf57 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -150,8 +150,11 @@
         set quantity_available=quantity_available+#{quantity},
             update_time=now(),area=actual_signal_area*quantity_available
         where order_number=#{orderNumber}  and order_id=#{orderId}
-        <if test="boxNo != null and boxNo != ''">
+        <if test="boxNo != null ">
             and trim(box_no) = trim(#{boxNo})
+        </if>
+        <if test="boxNo == null ">
+            and box_no  is null
         </if>
     </update>
 
@@ -160,8 +163,11 @@
         set quantity_available=quantity_available-#{quantity},
             update_time=now(),area=actual_signal_area*quantity_available
         where order_id=#{orderId}  and order_number=#{orderNumber}
-        <if test="boxNo != null and boxNo != ''">
+        <if test="boxNo != null ">
             and trim(box_no) = trim(#{boxNo})
+        </if>
+        <if test="boxNo == null ">
+            and box_no  is null
         </if>
     </update>
 
@@ -169,18 +175,23 @@
         update mm.finished_goods_inventory
         set inventory=inventory+#{quantity}
         where order_number=#{orderNumber}  and order_id=#{orderId}
-        <if test="remarks != null and remarks != ''">
+        <if test="remarks != null ">
             and trim(box_no) = trim(#{remarks})
         </if>
-
+        <if test="remarks == null ">
+            and box_no  is null
+        </if>
     </update>
 
     <update id="updateInventoryInventoryOut">
         update mm.finished_goods_inventory
         set inventory=inventory-#{quantity}
         where order_number=#{orderNumber}  and order_id=#{orderId}
-        <if test="boxNo != null and boxNo != ''">
+        <if test="boxNo != null ">
             and trim(box_no) = trim(#{boxNo})
+        </if>
+        <if test="boxNo == null ">
+            and box_no  is null
         </if>
 
     </update>
@@ -307,8 +318,11 @@
         update sd.delivery_detail
         set delivery_detail_state=#{state}
         where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId}
-        <if test="remarks != null and remarks != ''">
+        <if test="remarks != null ">
             and trim(box_no) = trim(#{remarks})
+        </if>
+        <if test="remarks == null ">
+            and box_no  is null
         </if>
     </update>
 
@@ -488,6 +502,10 @@
         select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
     </select>
 
+    <select id="findFinishedOperateLogQuantity"  >
+        select sum(quantity) from mm.finished_operate_log  where operate_type='鍑哄簱' and status='鏈鏍�' and order_id=#{orderId}
+    </select>
+
     <update id="updateOrderWarehousingState">
         update sd.`order`
         set warehousing=#{state}
@@ -547,12 +565,15 @@
         <if test="remark != null and remark != ''">
             , remark= #{remark}
         </if>
-        <if test="container != null and container != ''">
+        <if test="container != null ">
             , box_no= #{container}
         </if>
         where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId}
-        <if test="container != null and container != ''">
+        <if test="container != null ">
             and box_no= #{container}
+        </if>
+        <if test="container == null ">
+            and box_no  is null
         </if>
 
     </update>
@@ -564,6 +585,9 @@
         where order_number=#{finishedOperateLog.operationNumber}  and order_id=#{finishedOperateLog.orderId}
         <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
             and box_no=#{finishedOperateLog.remarks}
+        </if>
+        <if test="finishedOperateLog.remarks == null ">
+            and box_no  is null
         </if>
     </update>
 
@@ -596,10 +620,12 @@
         select count(*)
         from  mm.`finished_goods_inventory`
         where order_number = #{orderNumber} and order_id=#{orderId}
-        <if test="boxNo != null and boxNo != ''">
+        <if test="boxNo != null ">
             and box_no=#{boxNo}
         </if>
-
+        <if test="boxNo == null ">
+            and box_no  is null
+        </if>
 
     </select>
 
@@ -607,8 +633,11 @@
         select count(*)
         from  mm.`finished_goods_inventory`
         where order_number = #{orderNumber} and order_id=#{orderId}
-        <if test="container != null and container != ''">
+        <if test="container != null ">
             and box_no=#{container}
+        </if>
+        <if test="container == null ">
+            and box_no  is null
         </if>
 
     </select>
@@ -1070,9 +1099,12 @@
           and order_id=#{orderId}
           and delivery_id=#{deliveryId}
           and delivery_detail_state=0
-        <if test="boxNo != null and boxNo != ''">
+        <if test="boxNo != null ">
             and  box_no=trim(#{boxNo})
         </if>
+        <if test="boxNo == null ">
+            and  box_no is null
+        </if>
     </select>
 
     <select id="getSelectDeliveryDetailDeliveryId"  resultMap="selectDelivery">

--
Gitblit v1.8.0