From 3bee17a52f3ee1f493048465f3e07b31c2102ee5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 23 二月 2024 16:51:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
index 3594b93..e592948 100644
--- a/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml
@@ -64,6 +64,7 @@
<result column="product_name" property="productName"/>
<result column="product_id" property="productId"/>
<result column="warehouse_num" property="warehouseNum"/>
+ <result column="delivery_num" property="deliveryNum"/>
<result column="order_number" property="deliveryDetail.orderNumber"/>
<result column="delivery_id" property="deliveryDetail.deliveryId"/>
@@ -263,7 +264,7 @@
<update id="updateDeliveryDetailState">
update sd.delivery_detail
set delivery_detail_state=#{state}
- where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId}
+ where order_number=#{orderDetail.deliveryDetail.orderNumber} and order_id=#{orderDetail.deliveryDetail.orderId} and delivery_id=#{orderDetail.deliveryDetail.deliveryId}
</update>
<update id="updateInventoryquantityavailable">
@@ -347,6 +348,7 @@
od.height,
d.quantity,
od.warehouse_num,
+ od.delivery_num,
d.area,
od.building_number,
d.creator,
@@ -421,6 +423,14 @@
select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}
</select>
+ <select id="findDeliveryQuantity" >
+ select quantity from sd.`delivery` where delivery_id=#{deliveryId}
+ </select>
+
+ <select id="findDeliverydetailsum" >
+ select sum(quantity) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
+ </select>
+
<update id="updateOrderWarehousingState">
update sd.`order`
set warehousing=#{state}
@@ -433,6 +443,12 @@
where order_id=#{orderId}
</update>
+ <update id="updateDeliveryDeliveryState">
+ update sd.`delivery`
+ set stock_state=#{state}
+ where delivery_id=#{deliveryId}
+ </update>
+
<update id="updateIntOrderNumberConut">
update sd.order_detail
set warehouse_num=warehouse_num+${quantity}
--
Gitblit v1.8.0