From dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 七月 2024 15:58:34 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 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 7448fbc..5f16fdd 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -461,7 +461,7 @@
 
     <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>
 
@@ -529,6 +529,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};
 
@@ -837,4 +844,42 @@
         ;
     </select>
 
+    <select id="getSelectOrderDetail" >
+        select * from sd.order_detail where order_id=#{orderId}
+    </select>
+
+    <insert id="insertOrderFinishedGoodsInventory"  useGeneratedKeys="true"  >
+        insert into mm.finished_goods_inventory (order_id,
+                                                 order_number,
+                                                 process_id,
+                                                 inventory,
+                                                 actual_signal_area,
+                                                 area,
+                                                 quantity_available,
+                                                 warehouse_number,
+                                                 storage_region,
+                                                 `status`,
+                                                 enter_storage_time,
+                                                 update_time,
+                                                 end_time,
+                                                 remark
+        )
+        values (
+                   #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},
+                   #{orderDetail.computeGrossArea},
+                   #{orderDetail.quantity},null,"",
+                   0,now(),now(),null,""
+               )
+    </insert>
+
+    <update id="updateOrderInventory">
+        update mm.finished_goods_inventory
+        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>
+
+
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0