From c25ef736f5b3701cc91ac88e9d278b45d9b4035c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 14:55:31 +0800
Subject: [PATCH] 补充
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 17c2508..7e2ab2e 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -83,7 +83,7 @@
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
mi.available_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
+ ou.not_use_count AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -100,7 +100,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 ou.state=1
+ ou.not_use_count>0 and mi.plan_quantity>0 and op.state>=100 and ou.state=1
</where>
order by ou.id desc
@@ -170,8 +170,8 @@
ou.id as useId,
ou.project_no as projectNo,
mi.inventory_quantity AS inventoryQuantity,
- mi.plan_quantity AS availableQuantity,
- mi.plan_quantity AS planQuantity,
+ ou.not_use_count AS availableQuantity,
+ ou.not_use_count AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -247,7 +247,7 @@
and mo.reviewed regexp #{materialOutbound.reviewed}
</if>
</where>
- order by mo.reviewed_state desc,mo.create_time desc
+ order by mo.create_time desc
limit #{offset},#{pageSize};
</select>
@@ -281,7 +281,6 @@
and mo.reviewed regexp #{materialOutbound.reviewed}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -363,7 +362,6 @@
and rw.batch regexp #{returningWarehouse.batch}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
<select id="getSelectMaterialOutbound">
@@ -422,6 +420,7 @@
<select id="getSelectMaterialOutboundEngineering" >
select
+ ou.id as useId,
ou.project_no as projectNo,
modd.inventory_id as id,
modd.inventory_organization as inventoryOrganization,
@@ -511,7 +510,6 @@
and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
</if>
</where>
- limit #{offset},#{pageSize};
</select>
@@ -682,14 +680,14 @@
</insert>
<update id="updateMaterialInventoryAvailableOptOut">
- update mm.material_inventory
- set available_quantity=available_quantity-#{quantity}
+ update pp.optimize_use
+ set not_use_count=not_use_count-#{quantity}
where id=#{useId}
</update>
<update id="updateMaterialInventoryAvailableOptInt">
- update mm.material_inventory
- set available_quantity=available_quantity+#{quantity}
+ update pp.optimize_use
+ set not_use_count=not_use_count+#{quantity}
where id=#{useId}
</update>
--
Gitblit v1.8.0