From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
index 66a89fa..f93d94e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -23,7 +23,7 @@
//鏌ヨ绗竴娆℃帓鐗堟暟鎹�
@ApiOperation("鍔犺浇鏃舵煡璇㈡帓鐗堟暟鎹帴鍙�")
- @SaCheckPermission("ProductionScheduling.search")
+ @SaCheckPermission("productionScheduling.search")
@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@@ -36,7 +36,7 @@
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.search")
+ @SaCheckPermission("productionScheduling.search")
@PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
public Result selectScheduling(
@PathVariable Integer pageNum,
@@ -56,7 +56,7 @@
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.add")
+ @SaCheckPermission("productionScheduling.add")
@PostMapping("/addScheduling")
public Result addScheduling( @RequestBody Map<String,Object> object){
@@ -70,7 +70,7 @@
//鍒犻櫎鎺掍骇鏁版嵁
@ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.delete")
+ @SaCheckPermission("productionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
@@ -83,7 +83,7 @@
}
@ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.review")
+ @SaCheckPermission("productionScheduling.review")
@PostMapping("/examineScheduling")
public Result examineScheduling( @RequestBody Map<String,Object> object){
@@ -95,4 +95,17 @@
}
}
+ @ApiOperation("鎺掔増鍙嶅鎺ュ彛")
+ @SaCheckPermission("productionScheduling.review")
+ @PostMapping("/cancelReviewScheduling")
+ public Result cancelReviewScheduling( @RequestBody Map<String,Object> object){
+
+ if(productionSchedulingService.cancelReviewSchedulingSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍙嶅澶辫触");
+
+ }
+ }
+
}
--
Gitblit v1.8.0