From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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/ReworkController.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
index dd9ff1e..1afeace 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.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.Rework;
@@ -7,6 +8,7 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReworkService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,6 +17,7 @@
import java.util.Map;
@RestController
+@Api(value="杩斿伐controller",tags={"杩斿伐鎿嶄綔鎺ュ彛"})
@RequestMapping("/rework")
public class ReworkController {
@@ -24,42 +27,32 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
- @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @ApiOperation("鍙繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @SaCheckPermission("AddRework.search")
@PostMapping("/getSelectRework/{pageNum}/{pageSize}")
public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
}
- @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @ApiOperation("杩斿伐鏁版嵁鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SelectRework.search")
@PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
}
- @ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
+ @ApiOperation("杩斿伐鎺ュ彛鏂板")
+ @SaCheckPermission("AddRework.add")
@PostMapping("/saveRework")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- if(reworkService.saveRework(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触");
-
- }
+ return Result.seccess(reworkService.saveRework(object));
}
- @ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
+ @ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
+ @SaCheckPermission("SelectRework.review")
@PostMapping("/updateRework")
public Result updateRework( @RequestBody Map<String,Object> object){
- if(reworkService.updateRework(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
+ return Result.seccess(reworkService.updateRework(object));
}
}
--
Gitblit v1.8.0