From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +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/controller/mm/MaterialInventoryController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
index 7d8b272..bc35d70 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -3,10 +3,8 @@
 
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
-import com.example.erp.entity.mm.MaterialInventory;
-import com.example.erp.entity.mm.MaterialOutbound;
-import com.example.erp.entity.mm.MaterialOutboundDetail;
-import com.example.erp.entity.mm.MaterialStore;
+import com.example.erp.entity.mm.*;
+import com.example.erp.entity.pp.OptimizeUse;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.mm.MaterialInventoryService;
 import com.example.erp.service.mm.MaterialStoreService;
@@ -53,10 +51,22 @@
         return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
     }
 
+    @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�")
+    @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
+    public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
+        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
+    }
+
     @ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛")
     @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
     public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
         return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
+    }
+
+    @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
+    public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
+        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
     }
 
     @ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
@@ -71,7 +81,8 @@
         return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
     }
 
-    @ApiOperation("鏉愭枡鍑哄簱淇敼鎺ュ彛")
+
+    @ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
     @PostMapping("/updateMaterialOutboundToExamine")
     public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
         if(materialInventoryService.updateMaterialOutboundToExamine(object)){
@@ -96,6 +107,42 @@
         }
     }
 
+    @ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
+    @PostMapping("/saveReturningWarehouse")
+    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
+        if(materialInventoryService.saveReturningWarehouse(object)){
+            return Result.seccess();
+        }else {
+            throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+        }
+    }
+
+    @ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
+    public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
+        return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
+    }
+
+    @ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
+    @PostMapping("/updateReturningWarehouseToExamine")
+    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
+        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
+            return Result.seccess();
+
+        }else {
+            throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+
+        }
+    }
+
+
+    @ApiOperation("鐗╂枡杩斿簱鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
+    public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
+        return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
+    }
+
 
 
 

--
Gitblit v1.8.0