From 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 15 三月 2024 09:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 ae59bd5..017ceac 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -162,7 +162,7 @@
left join sd.order_detail od on fgi.order_id = od.order_id and fgi.order_number = od.order_number
left join sd.`order` o on fgi.order_id = o.order_id
<where>
- and fgi.quantity_available>0
+ and fgi.status = 0 and fgi.quantity_available>0
<if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">
and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}
</if>
@@ -276,7 +276,7 @@
</update>
- <select id="getseletdeliveryDetailPageTotal" >
+ <select id="getSelectDeliveryDetailPageTotal" >
select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
count(dd.id) as 'total'
from sd.delivery_detail dd
@@ -339,7 +339,7 @@
limit #{offset},#{pageSize};
</select>
- <select id="getseletdeliveryDetail" resultMap="selectDelivery">
+ <select id="getSelectDeliveryDetail" resultMap="selectDelivery">
select dd.delivery_id,
dd.order_number,
dd.order_id,
@@ -467,7 +467,7 @@
<update id="updateflowcard">
update pp.flow_card
- set received_quantity=received_quantity+${inventoryQuantity}
+ set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()
where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId}
</update>
@@ -522,7 +522,7 @@
</select>
- <select id="getseletwarehousing" resultMap="selectFlowCard">
+ <select id="getSelectWarehousing" resultMap="selectFlowCard">
select
fc.id,
o.order_id,
@@ -594,7 +594,8 @@
group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time
limit #{offset},#{pageSize};
</select>
- <select id="getseletwarehousingPageTotal" >
+ <select id="getSelectWarehousingPageTotal" >
+ select
CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',
count(zu.order_number) as 'total' from (
select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on
@@ -738,8 +739,7 @@
</where>
order by fgi.id
- limit #{offset},#{pageSize}
- ;
+ limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0