From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +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 | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 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 9c41b32..9e20ef4 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,6 +51,8 @@
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);
@@ -112,8 +114,16 @@
Boolean updateMaterialInventoryInventoryInt(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryInventoryPlanQuantityOut(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryInventoryPlanQuantityInt(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
+
Boolean updateMaterialInventoryAvailableInventoryOut(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
+
+ Boolean updateMaterialInventoryAvailableInventoryOutMes(@Param("inventoryId") Long inventoryId,
+ @Param("quantity") Integer quantity);
Boolean updateMaterialInventoryAvailableInventoryInt(@Param("inventoryId") Long inventoryId,
@Param("quantity") Integer quantity);
@@ -229,4 +239,24 @@
List<MaterialLog> exportMaterialLogReport(List<LocalDate> dates, String type);
+ List<MaterialOutbound> getSelectMaterialOutboundProjectNo(@Param("projectNo") String projectNo);
+
+ OptimizeUse getSelectOptimizeUses(@Param("projectNo") String projectNo,@Param("width") Double width,@Param("height") Double height);
+
+ List<MaterialOutboundDetail> getSelectMaterialOutboundOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("useId") Integer useId);
+
+ Boolean updateMaterialOutboundOptimizeUses(@Param("useId") Integer useId,@Param("quantity") Integer quantity);
+
+ Boolean insertMaterialOutboundDetailOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("number") Integer number,
+ @Param("inventoryId") Long inventoryId,@Param("materialCode") Long materialCode,@Param("inventoryArea") String inventory_area,
+ @Param("useId") Integer useId,@Param("outboundQuantity") Integer outboundQuantity,
+ @Param("singlePieceArea") Double singlePieceArea,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+
+ Boolean insertMaterialOutboundOptimizeUses(@Param("materialOutboundId") String materialOutboundId,@Param("projectNo") String projectNo,
+ @Param("name") String name);
+
+ Boolean updateOptimizeUsesMes(@Param("useId") Integer useId,@Param("quantity") Integer quantity);
+
+ String selectProjectNo(@Param("useId") Integer useId);
+
}
--
Gitblit v1.8.0