From c2ad18d09d62ec9922fe234c7d141258f2acf577 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 28 三月 2025 08:10:27 +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 |   13 +++++++++++++
 1 files changed, 13 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 982dad1..13617d9 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
@@ -182,6 +182,19 @@
     }
 
 
+    @ApiOperation("mes鍒囧壊鎶ュ伐")
+    @PostMapping  ("/mesMaterialOutbound")
+    public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork)  {
+        return  Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
+    }
+
+    @ApiOperation("鐗╂枡鏂板杩斿洖鎺ュ彛")
+    @PostMapping("/cancelMaterialAdditionRecord")
+    public Result cancelMaterialAdditionRecord( @RequestBody Map<String,Object>  object){
+        return Result.seccess(materialInventoryService.cancelMaterialAdditionRecord(object));
+    }
+
+
 
 
 }

--
Gitblit v1.8.0