From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 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..fc48579 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -436,8 +436,12 @@
select quantity from sd.`delivery` where delivery_id=#{deliveryId}
</select>
+ <select id="findOrderDelivery" >
+ select * from sd.`delivery` where order_id=#{orderId}
+ </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 +465,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>
@@ -530,6 +540,20 @@
<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};
+
+ </select>
+
+ <select id="findOrderDetailNumberd" >
+ select *
+ from sd.`order_detail`
where order_number = #{orderNumber} and order_id=#{orderId};
</select>
@@ -867,11 +891,21 @@
<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>
+ <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