From a4908aafb0aa9adbc70a006214e7580c626396a5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 15 八月 2024 17:10:06 +0800
Subject: [PATCH] 添加流程卡上是否显示其它备注配置
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 db4977a..07f788a 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
@@ -35,17 +35,17 @@
List<Map<String,Object>> getSelectMaterialInventory(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
- @Param("materialInventory") MaterialInventory materialInventory);
+ @Param("materialInventory") MaterialInventory materialInventory, @Param("ids") List<Long> ids);
- Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory);
+ Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory, @Param("ids") List<Long> ids);
List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize,
- @Param("optimizeUse") OptimizeUse optimizeUse);
+ @Param("optimizeUse") OptimizeUse optimizeUse, @Param("ids") List<Long> ids);
- Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse);
+ Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse, @Param("ids") List<Long> ids);
Boolean insertMaterialStore(@Param("type") String type,
@Param("json") String json);
@@ -185,4 +185,21 @@
@Param("totalArea") Double totalArea,
@Param("returningWarehouseDetail") ReturningWarehouseDetail returningWarehouseDetail);
+ Boolean updateMaterialInventoryArea(@Param("materialCode") Long materialCode,@Param("singlePieceArea") Double singlePieceArea);
+
+ List<SurplusMaterials> getSelectSurplusMaterialsDate(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ Map<String,Integer> getSelectSurplusMaterialsDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate,SurplusMaterials surplusMaterials);
+
+ SurplusMaterials selectSurplusMaterialsCount( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+ Boolean insertSurplusMaterials( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ Boolean insertSurplusMaterialsLog(@Param("surplusMaterials") SurplusMaterials surplusMaterials,String creator, String type);
+
+ Boolean updateSurplusMaterialsOutQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
+ Boolean updateSurplusMaterialsIntQuantity( @Param("surplusMaterials") SurplusMaterials surplusMaterials);
+
}
--
Gitblit v1.8.0