From cc80aa01b8efa26a2865d23fa9f3398f18247fcc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 24 九月 2024 09:06:31 +0800
Subject: [PATCH] 已转加工单禁用复选框

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 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 780b238..b16d288 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -437,7 +437,7 @@
     </select>
 
     <select id="findDeliverydetailsum"  >
-        select sum(quantity) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
+        select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
     </select>
 
     <update id="updateOrderWarehousingState">
@@ -461,13 +461,19 @@
 
     <update id="updateIntOrderNumberConut">
         update sd.order_detail
-        set warehouse_num=warehouse_num+${quantity}
+        set warehouse_num=warehouse_num+${quantity},update_time=now()
         where order_number=#{orderNumber} and order_id=#{orderId}
     </update>
 
     <update id="updateOutOrderNumberConut">
         update sd.order_detail
         set warehouse_num=warehouse_num-${quantity}
+        where order_number=#{orderNumber} and order_id=#{orderId}
+    </update>
+
+    <update id="updateOrderNumberConut">
+        update sd.order_detail
+        set warehouse_num=${quantity},update_time=now()
         where order_number=#{orderNumber} and order_id=#{orderId}
     </update>
 
@@ -529,6 +535,13 @@
 
     <select id="findOrderNumberdcount" >
         select count(*)
+        from  mm.`finished_goods_inventory`
+        where order_number = #{orderNumber} and order_id=#{orderId};
+
+    </select>
+
+    <select id="findOrderNumberd" >
+        select *
         from  mm.`finished_goods_inventory`
         where order_number = #{orderNumber} and order_id=#{orderId};
 
@@ -867,7 +880,7 @@
 
     <update id="updateOrderInventory">
         update mm.finished_goods_inventory
-        set inventory=inventory+${orderDetail.quantity},quantity_available=quantity_available+${orderDetail.quantity},
+        set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},
         update_time=now(),area=actual_signal_area*quantity_available
         where order_number=#{orderDetail.orderNumber}  and order_id=#{orderDetail.orderId}
     </update>

--
Gitblit v1.8.0