From 368b5a8bed1af57fb51f5c836e2e15059765019b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 09:04:02 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 9fdf8c6..469830d 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -583,6 +583,38 @@
</select>
+ <select id="getSelectWarehousingByProcessId" resultMap="selectFlowCard">
+ select
+ fc.id,
+ o.order_id,
+ od.building_number,
+ od.product_id,
+ od.product_name,
+ od.width,
+ od.height,
+ o.creator,
+ o.project,
+ fc.order_number,
+ od.quantity,
+ fc.inventory_quantity-fc.received_quantity as inventory_quantity,
+ o.area,
+ fc.process_id,
+ fc.received_quantity,
+ o.batch,
+ o.calculate_type,
+ od.compute_area,
+ od.price,
+ od.area as areas,
+ od.gross_area,
+ od.compute_gross_area
+ 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 fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0 and
+ fc.order_id=#{order_id} and fc.order_number=#{order_number} and fc.process_id=#{process_id};
+
+ </select>
+
<select id="getSelectWarehousing" resultMap="selectFlowCard">
select
--
Gitblit v1.8.0