From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整
---
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 1cfa8bc..fc889c2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -538,6 +538,10 @@
delete from mm.material_log where operation_order_number=#{materialOutboundId}
</delete>
+ <delete id="deleteMaterialLogById" >
+ delete from mm.material_log where id=#{id}
+ </delete>
+
<delete id="deleteReturningWarehouseDetail" >
delete from mm.returning_warehouse_detail where returning_id=#{returningId}
</delete>
@@ -583,11 +587,11 @@
</select>
<select id="getMaterialInventoryCount" >
- select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+ select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
</select>
<select id="getMaterialInventoryCountNull" >
- select count(*) from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
+ select * from mm.material_inventory where material_code=#{materialCode} and date_of_manufacture is null
</select>
<select id="getMaterialInventoryCountId" >
@@ -779,7 +783,21 @@
update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
total_area=single_piece_area*inventory_quantity
- where material_code=#{materialCode}
+ where material_code=#{materialCode} and date_of_manufacture is null
+ </update>
+
+ <update id="updateMaterialInventoryOut" >
+ update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
+ available_quantity=available_quantity-#{quantity},
+ total_area=single_piece_area*inventory_quantity
+ where material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+ </update>
+
+ <update id="updateMaterialInventoryNullOut" >
+ update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
+ available_quantity=available_quantity-#{quantity},
+ total_area=single_piece_area*inventory_quantity
+ where material_code=#{materialCode} and date_of_manufacture is null
</update>
<update id="updateMaterialInventoryReturning" >
--
Gitblit v1.8.0