From 2a8a645716d3772de03aa43cb126b8aa738d2015 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 12:44:04 +0800
Subject: [PATCH] 物料新增撤回功能

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
index 9e20ef4..6efb6fe 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
@@ -60,6 +60,8 @@
 
     Boolean deleteMaterialLog(@Param("materialOutboundId") String materialOutboundId);
 
+    Boolean deleteMaterialLogById(@Param("id") Long id);
+
     Integer getMaximum(@Param("type") String type);
 
     Integer getMaximums(@Param("type") String type);
@@ -68,9 +70,9 @@
 
     Integer getReturningWarehouseCount(@Param("returningId") String returningId);
 
-    Integer getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+    List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
 
-    Integer getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
+    List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
 
 
     List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
@@ -190,6 +192,11 @@
                                     @Param("totalArea") Double totalArea,
                                     @Param("materialInventory") MaterialInventory materialInventory);
 
+    Boolean updateMaterialInventoryOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,
+                                    @Param("dateOfManufacture") String dateOfManufacture);
+
+    Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity);
+
     Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
                                     @Param("totalArea") Double totalArea,
                                     @Param("materialInventory") MaterialInventory materialInventory);

--
Gitblit v1.8.0