From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 ebdbc19..edc21bb 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
@@ -70,14 +70,18 @@
Integer getReturningWarehouseCount(@Param("returningId") String returningId);
- List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+ List<MaterialInventory> getMaterialInventoryCount(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
- List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode);
+ List<MaterialInventory> getMaterialInventoryCountNull(@Param("materialCode") Long materialCode,String producer);
+
+ List<MaterialInventory> getMaterialInventoryCount1(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer,Long id);
+
+ List<MaterialInventory> getMaterialInventoryCountNull1(@Param("materialCode") Long materialCode,String producer,Long id);
- List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture);
+ List<MaterialInventory> getMaterialInventoryCountId(@Param("materialCode") Long materialCode,@Param("dateOfManufacture") LocalDate dateOfManufacture,String producer);
- List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode);
+ List<MaterialInventory> getMaterialInventoryCountNullId(@Param("materialCode") Long materialCode,String producer);
List<MaterialOutboundDetail> getIsNotMaterialOutboundDetail( @Param("materialOutboundId") String materialOutboundId);
@@ -193,9 +197,9 @@
@Param("materialInventory") MaterialInventory materialInventory);
Boolean updateMaterialInventoryOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,
- @Param("dateOfManufacture") String dateOfManufacture);
+ @Param("dateOfManufacture") String dateOfManufacture,@Param("producer") String producer);
- Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity);
+ Boolean updateMaterialInventoryNullOut(@Param("materialCode") Long materialCode,@Param("quantity") Integer quantity,@Param("producer") String producer);
Boolean insertMaterialInventory(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea,
@Param("totalArea") Double totalArea,
@@ -273,4 +277,6 @@
List<Map<String,Object>> getSelectMaterialInventoryMes();
Boolean updateMaterialInventoryAll(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
+
+ Boolean updateMaterialInventoryOne(@Param("materialInventoryId") Long materialInventoryId,@Param("materialInventory") MaterialInventory materialInventory);
}
--
Gitblit v1.8.0