From 0b2fa1993f65d08e2046ff1d86ede98627e7b2dc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 26 十二月 2024 08:51:24 +0800
Subject: [PATCH] 修复工程创建后会有undefined出现的问题
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 eff0aa6..3063c2a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -436,6 +436,10 @@
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 ifnull(sum(quantity),0) from sd.`delivery_detail` where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
</select>
@@ -547,6 +551,13 @@
</select>
+ <select id="findOrderDetailNumberd" >
+ select *
+ from sd.`order_detail`
+ where order_number = #{orderNumber} and order_id=#{orderId};
+
+ </select>
+
<select id="finishedGoodsInventorybycount" >
select quantity_available
from mm.`finished_goods_inventory`
@@ -573,10 +584,11 @@
fc.process_id,
fc.received_quantity,
o.batch
- from pp.flow_card fc left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
+ from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card group by order_id,order_number,process_id) as fc
+ left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
o.order_id=fc.order_id
<where>
- and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity
+ and fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity
<if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">
and o.order_id regexp #{flowCard.order.orderId}
</if>
@@ -770,7 +782,7 @@
</if>
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize};
</select>
@@ -845,7 +857,7 @@
</where>
- order by fgi.id desc
+ order by fgi.update_time desc
limit #{offset},#{pageSize}
;
</select>
--
Gitblit v1.8.0