From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 5f16fdd..508c9e2 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">
@@ -468,6 +468,12 @@
<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>
@@ -537,6 +543,13 @@
<select id="findOrderNumberd" >
select *
from mm.`finished_goods_inventory`
+ where order_number = #{orderNumber} and order_id=#{orderId};
+
+ </select>
+
+ <select id="findOrderDetailNumberd" >
+ select *
+ from sd.`order_detail`
where order_number = #{orderNumber} and order_id=#{orderId};
</select>
@@ -879,6 +892,16 @@
where order_number=#{orderDetail.orderNumber} and order_id=#{orderDetail.orderId}
</update>
+ <select id="findFlowCard">
+ select * from pp.flow_card
+ where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId} group by process_id
+ </select>
+
+ <select id="findDeliverydetail">
+ select * from sd.delivery_detail
+ where order_number=#{orderNumber} and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
+ </select>
+
--
Gitblit v1.8.0