From 26633e17d9e9a612e4744405d214cf513d13bffd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 13:56:34 +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 | 14 +++++++++-----
1 files changed, 9 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 595fea9..fbd62e5 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
@@ -28,12 +28,9 @@
@SaCheckPermission("CreateOutbound.add")
@PostMapping("/saveMaterialOutbound")
public Result saveMaterialOutbound( @RequestBody Map<String,Object> object){
- if(materialInventoryService.saveMaterialOutbound(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
- }
+ return Result.seccess(materialInventoryService.saveMaterialOutbound(object));
+
}
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
@@ -149,6 +146,13 @@
return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
}
+ @ApiOperation("鐗╂枡鍑哄簱鎵撳嵃鎺ュ彛")
+ @SaCheckPermission("SelectIngredientsStock.search")
+ @GetMapping ("/printCreateOutbound/{materialOutboundId}")
+ public Result printCreateOutbound(@PathVariable String materialOutboundId) {
+ return Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
+ }
+
--
Gitblit v1.8.0