From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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/MaterialStoreController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
index 3b36cc6..92ed308 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -15,43 +15,38 @@
import java.util.Map;
@RestController
-@RequestMapping("/MaterialStore")
+@RequestMapping("/materialStore")
@Api(value="鐗╂枡controller",tags={"鐗╂枡鎿嶄綔鎺ュ彛"})
public class MaterialStoreController {
@Autowired
MaterialStoreService materialStoreService;
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
- @SaCheckPermission("CreateIngredients.add")
+ @SaCheckPermission("createIngredients.add")
@PostMapping("/saveMaterialStore")
public Result saveMaterialStore( @RequestBody Map<String,Object> object){
- if(materialStoreService.saveMaterialStore(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
-
- }
+ return Result.seccess(materialStoreService.saveMaterialStore(object));
}
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectIngredients.search")
+ @SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
}
+ @ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectIngredients.search")
+ @PostMapping("/getSelectMaterialStore")
+ public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){
+ return Result.seccess(materialStoreService.getSelectMaterialStores(materialStore));
+ }
+
@ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
- @SaCheckPermission("SelectIngredients.delete")
+ @SaCheckPermission("selectIngredients.delete")
@PostMapping("/deleteMaterialStore")
public Result deleteMaterialStore( @RequestBody Map<String,Object> object){
- if(materialStoreService.deleteMaterialStore(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
-
- }
+ return Result.seccess(materialStoreService.deleteMaterialStore(object));
}
--
Gitblit v1.8.0