From 1b63cf22b4f488bb78135bd25669105cc64d4712 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 19 十二月 2024 17:01:55 +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 | 10 ++++++++++
1 files changed, 10 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..0f77b7a 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
@@ -51,10 +51,14 @@
Boolean insertMaterialStore(@Param("type") String type,
@Param("json") String json);
+ Boolean deleteMaterialInventory(@Param("ids") List<Long> ids);
+
Boolean updateMaterialStore(@Param("type") String type,
@Param("json") String json, @Param("id") Long id);
Boolean deleteMaterialOutbound(@Param("materialOutboundId") String materialOutboundId);
+
+ Boolean deleteMaterialLog(@Param("materialOutboundId") String materialOutboundId);
Integer getMaximum(@Param("type") String type);
@@ -119,6 +123,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 +178,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