From 33ef2b3bd1e97e392605ff4ca9a1b01f931cf447 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 12 二月 2025 15:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 6c8c158..81a02cf 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -84,7 +84,7 @@
ou.id as useId,
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
+ mi.available_quantity AS availableQuantity,
mi.plan_quantity AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
@@ -102,8 +102,7 @@
ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
left join pp.optimize_project op on op.project_no=ou.project_no
<where>
- mi.plan_quantity>0 and op.state>=100 and
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
+ mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
order by ou.id desc
@@ -112,16 +111,14 @@
<select id="getSelectMaterialInventoryEngineeringDatePageTotal">
select
- CEILING(count(id)/#{pageSize}) as 'pageTotal',
- count(id) as 'total'
- from
- pp.optimize_use ou
+ CEILING(count(ou.id)/#{pageSize}) as 'pageTotal',
+ count(ou.id) as 'total'
+ from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+ left join pp.optimize_project op on op.project_no=ou.project_no
<where>
- ou.not_use_count>0 and ou.state=1 and
- date(ou.create_time)>=#{startDate} and date(ou.create_time) <= #{endDate}
+ mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
- limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0