From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/pp/BasicDataProduceController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
index bd885a7..e29b5dd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/BasicDataProduceController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.BasicDataProduce;
@@ -23,28 +24,30 @@
@ApiOperation("鏌ヨ宸ュ簭鎺ュ彛")
@PostMapping ("/selectProcess")
public Result selectProcess() {
- return Result.seccess(basicDateProduceService.selectProcessSv());
+ return Result.success(basicDateProduceService.selectProcessSv());
}
@ApiOperation("鏌ヨ鎵�鏈夊熀纭�鏁版嵁鎺ュ彛")
+ @SaCheckPermission("selectProductionBasicData.search")
@PostMapping ("/selectBasic")
public Result selectBasic() {
- return Result.seccess(basicDateProduceService.selectBasicSv());
+ return Result.success(basicDateProduceService.selectBasicSv());
}
@ApiOperation("鏍规嵁Id鏌ヨ瀵瑰簲鍩虹鏁版嵁鎺ュ彛")
@PostMapping ("/openSelectId/{id}")
public Result openSelectId(
@PathVariable String id){
- return Result.seccess(basicDateProduceService.openSelectIdSv(id));
+ return Result.success(basicDateProduceService.openSelectIdSv(id));
}
@ApiOperation("鍒犻櫎鍩虹鏁版嵁鎺ュ彛")
+ @SaCheckPermission("selectProductionBasicData.delete")
@PostMapping("/deleteBasic/{id}")
public Result deleteBasic(@PathVariable String id){
if(basicDateProduceService.deleteBasicSv(id)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触锛�");
@@ -58,7 +61,7 @@
@PathVariable String name,
@PathVariable String type){
if(basicDateProduceService.updateBasicSv(id,process,name,type)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
@@ -66,10 +69,11 @@
}
@ApiOperation("鐝粍鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("addTeamGroup.add")
@PostMapping("/saveTeamGroup")
public Result saveTeamGroup( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveTeamGroupSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -77,10 +81,11 @@
}
@ApiOperation("娆＄牬绫诲瀷鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("addBreakageType.add")
@PostMapping("/saveBreakageType")
public Result saveBreakageType( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveBreakageTypeSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -88,10 +93,11 @@
}
@ApiOperation("娆＄牬鍘熷洜鍩虹鏁版嵁娣诲姞鎺ュ彛")
+ @SaCheckPermission("addBreakageReason.add")
@PostMapping("/saveBreakageReason")
public Result saveBreakageReason( @RequestBody Map<String,Object> object){
if(basicDateProduceService.saveBreakageReasonSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
--
Gitblit v1.8.0