From 7ee68df04b7a169d51ab95ad9955276c9aff6ee1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 22 九月 2025 09:44:34 +0800
Subject: [PATCH] 流程卡查询界面修改表格下方汇总方式

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 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 43665b7..d2796c9 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
@@ -45,6 +45,7 @@
         return Result.seccess(materialInventoryService.saveMaterialInventory(object));
     }
 
+
     @ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
     @SaCheckPermission("selectIngredientsStock.search")
     @PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
@@ -188,7 +189,40 @@
         return  Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
     }
 
+    @ApiOperation("mes鍘熺墖鏌ヨ")
+    @PostMapping  ("/mesOriginalSelect")
+    public Result mesOriginalSelect()  {
+        return  Result.seccess(materialInventoryService.mesOriginalSelect());
+    }
 
+    @ApiOperation("鐗╂枡鏂板杩斿洖鎺ュ彛")
+    @PostMapping("/cancelMaterialAdditionRecord")
+    public Result cancelMaterialAdditionRecord( @RequestBody Map<String,Object>  object){
+        return Result.seccess(materialInventoryService.cancelMaterialAdditionRecord(object));
+    }
+
+    @ApiOperation("浼樺寲鐗╂枡搴撳瓨璁板綍鏌ヨ鎺ュ彛")
+    @SaCheckPermission("warehouseReport.search")
+    @PostMapping("/getOptimizeOutboundReport/{type}/{pageNum}/{pageSize}/{selectDate}")
+    public Result getOptimizeOutboundReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
+        return Result.seccess(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
+    }
+
+    @ApiOperation("鐗╂枡鍑哄簱淇濆瓨骞跺鏍告帴鍙�")
+    @SaCheckPermission("createOutbound.add")
+    @PostMapping("/saveToExamineMaterialOutbound")
+    public Result saveToExamineMaterialOutbound( @RequestBody Map<String,Object>  object){
+
+        return Result.seccess(materialInventoryService.saveToExamineMaterialOutbound(object));
+
+    }
+
+    @ApiOperation("鐗╂枡搴撳瓨淇敼鎺ュ彛")
+    @SaCheckPermission("selectIngredientsStock.add")
+    @PostMapping("/updateMaterialInventory")
+    public Result updateMaterialInventory( @RequestBody Map<String,Object>  object){
+        return Result.seccess(materialInventoryService.updateMaterialInventory(object));
+    }
 
 
 }

--
Gitblit v1.8.0