From 5ec9dc2cee9c172c7799235d0a6452dd3a229a0f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 15 十一月 2024 11:23:34 +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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 21a9f8f..c8d8951 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
@@ -42,12 +42,7 @@
@SaCheckPermission("selectIngredientsStock.add")
@PostMapping("/saveMaterialInventory")
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
- if(materialInventoryService.saveMaterialInventory(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
-
- }
+ return Result.seccess(materialInventoryService.saveMaterialInventory(object));
}
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
@@ -121,6 +116,13 @@
return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
}
+ @ApiOperation("鐗╂枡杩斿簱鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("returnToStorageCreate.delete")
+ @PostMapping("/deleteReturnToStorage")
+ public Result deleteReturnToStorage( @RequestBody Map<String,Object> object){
+ return Result.seccess(materialInventoryService.deleteReturnToStorage(object));
+ }
+
@ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
--
Gitblit v1.8.0