From e7a66108936ced80e112ab13f4b3aec1a6784bf7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 四月 2024 14:24:23 +0800
Subject: [PATCH] 修改
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 ca8f4f6..5293cf6 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -14,6 +14,7 @@
mi.producer,
mi.inventory_quantity AS inventoryQuantity,
mi.available_quantity AS availableQuantity,
+ mi.plan_quantity AS planQuantity,
mi.safety_stock AS safetyStock,
mi.total_area AS totalArea,
mi.single_piece_area singlePieceArea,
@@ -51,7 +52,8 @@
ou.id as useId,
ou.project_no as projectNo,
ou.use_count AS inventoryQuantity,
- ou.not_use_count AS availableQuantity,
+ mi.plan_quantity AS availableQuantity,
+ mi.plan_quantity AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -97,6 +99,7 @@
mi.producer,
mi.inventory_quantity AS inventoryQuantity,
mi.available_quantity AS availableQuantity,
+ mi.plan_quantity AS planQuantity,
mi.safety_stock AS safetyStock,
mi.total_area AS totalArea,
mi.single_piece_area singlePieceArea,
@@ -138,7 +141,8 @@
ou.id as useId,
ou.project_no as projectNo,
ou.use_count AS inventoryQuantity,
- ou.not_use_count AS availableQuantity,
+ mi.plan_quantity AS availableQuantity,
+ mi.plan_quantity AS planQuantity,
mi.id,
mi.inventory_organization as inventoryOrganization,
mi.material_code AS materialCode,
@@ -618,14 +622,14 @@
</insert>
<update id="updateMaterialInventoryAvailableOptOut">
- update pp.optimize_use
- set not_use_count=not_use_count-#{quantity}
+ update mm.material_inventory
+ set available_quantity=available_quantity-#{quantity}
where id=#{useId}
</update>
<update id="updateMaterialInventoryAvailableOptInt">
- update pp.optimize_use
- set not_use_count=not_use_count+#{quantity}
+ update mm.material_inventory
+ set available_quantity=available_quantity+#{quantity}
where id=#{useId}
</update>
@@ -643,13 +647,13 @@
<update id="updateMaterialInventoryInventoryOut">
update mm.material_inventory
- set inventory_quantity=inventory_quantity-#{quantity}
+ set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0)
where id=#{inventoryId}
</update>
<update id="updateMaterialInventoryInventoryInt">
update mm.material_inventory
- set inventory_quantity=inventory_quantity+#{quantity}
+ set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity}
where id=#{inventoryId}
</update>
--
Gitblit v1.8.0