From 95270d9f2d0c93b52569268737902c4f09216c6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 12:04:39 +0800
Subject: [PATCH] 返工查询后端筛选提交

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 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 641552a..1772c5c 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);
@@ -77,6 +77,8 @@
     List<ReturningWarehouseDetail> getIsNotReturningWarehouseDetail(@Param("returningId") String returningId);
 
     Boolean insertMaterialOutbound(@Param("materialOutbound") MaterialOutbound materialOutbound, @Param("number") String number);
+
+    Boolean updateMaterialOutbound(@Param("materialOutbound") MaterialOutbound materialOutbound, @Param("number") String number);
 
     Boolean insertReturningWarehouse(@Param("returningWarehouse") ReturningWarehouse returningWarehouse, @Param("number") String number);
 
@@ -187,4 +189,23 @@
 
     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);
+
+    Map<String,Object> getPrintCreateOutbound(String materialOutboundId);
+
+    List<Map<String,Object>> getPrintCreateOutboundDetail(String materialOutboundId);
+
 }

--
Gitblit v1.8.0