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/ProductionSchedulingController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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..ab5ddb8 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,
@@ -31,12 +31,12 @@
@PathVariable String processes,
@PathVariable String orderId,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
+ return Result.success(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.search")
+ @SaCheckPermission("productionScheduling.search")
@PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
public Result selectScheduling(
@PathVariable Integer pageNum,
@@ -48,7 +48,7 @@
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
+ return Result.success(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
@@ -56,12 +56,12 @@
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.add")
+ @SaCheckPermission("productionScheduling.add")
@PostMapping("/addScheduling")
public Result addScheduling( @RequestBody Map<String,Object> object){
if(productionSchedulingService.addSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -70,12 +70,12 @@
//鍒犻櫎鎺掍骇鏁版嵁
@ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.delete")
+ @SaCheckPermission("productionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
if(productionSchedulingService.deleteSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
@@ -83,16 +83,29 @@
}
@ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
- @SaCheckPermission("ProductionScheduling.review")
+ @SaCheckPermission("productionScheduling.review")
@PostMapping("/examineScheduling")
public Result examineScheduling( @RequestBody Map<String,Object> object){
if(productionSchedulingService.examineSchedulingSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
}
}
+ @ApiOperation("鎺掔増鍙嶅鎺ュ彛")
+ @SaCheckPermission("productionScheduling.review")
+ @PostMapping("/cancelReviewScheduling")
+ public Result cancelReviewScheduling( @RequestBody Map<String,Object> object){
+
+ if(productionSchedulingService.cancelReviewSchedulingSv(object)){
+ return Result.success();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍙嶅澶辫触");
+
+ }
+ }
+
}
--
Gitblit v1.8.0