From a99c1f36e52c75e0020127c62d39c1eddae4a036 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 七月 2025 17:07:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 15 +++++++++++++++
1 files changed, 15 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 02ccdce..dbe4b0e 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,6 +188,12 @@
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){
@@ -201,5 +207,14 @@
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));
+
+ }
+
}
--
Gitblit v1.8.0