From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 fccaa51..9c41b32 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
@@ -56,6 +56,8 @@
Boolean deleteMaterialOutbound(@Param("materialOutboundId") String materialOutboundId);
+ Boolean deleteMaterialLog(@Param("materialOutboundId") String materialOutboundId);
+
Integer getMaximum(@Param("type") String type);
Integer getMaximums(@Param("type") String type);
@@ -119,6 +121,8 @@
Boolean deleteReturningWarehouseDetail(@Param("returningId") String returningId);
+ Boolean deleteReturningWarehouse(@Param("returningId") String returningId);
+
List<MaterialOutbound> getSelectMaterialOutboundDate(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,String startDate, String endDate,
@Param("materialOutbound") MaterialOutbound materialOutbound);
@@ -172,6 +176,10 @@
@Param("totalArea") Double totalArea,
@Param("materialInventory") MaterialInventory materialInventory);
+ Boolean updateMaterialInventoryNull(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
+ @Param("totalArea") Double totalArea,
+ @Param("materialInventory") MaterialInventory materialInventory);
+
Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
@Param("totalArea") Double totalArea,
@Param("materialInventory") MaterialInventory materialInventory);
--
Gitblit v1.8.0