From ec976e88774d138236c09273705cb948a6e7a25f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 23 五月 2025 16:59:42 +0800
Subject: [PATCH] 对复合工序添加的类型,进行重新的逻辑处理

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java |   11 +++++++++++
 1 files changed, 11 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..02ccdce 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
@@ -188,7 +188,18 @@
         return  Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
     }
 
+    @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));
+    }
 
 
 }

--
Gitblit v1.8.0