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/pp/ProductionSchedulingController.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 3f5f84d..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
@@ -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.ProductionScheduling;
@@ -22,6 +23,7 @@
//鏌ヨ绗竴娆℃帓鐗堟暟鎹�
@ApiOperation("鍔犺浇鏃舵煡璇㈡帓鐗堟暟鎹帴鍙�")
+ @SaCheckPermission("productionScheduling.search")
@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@@ -34,34 +36,27 @@
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ @SaCheckPermission("productionScheduling.search")
+ @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
public Result selectScheduling(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @PathVariable String orderId,
+ @PathVariable String orderIds,
@PathVariable String processes,
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+
+ return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
- //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
- @ApiOperation("鏍规嵁鏉′欢鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
- @PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result selectSchedulingNot(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
- @PathVariable String orderId,
- @PathVariable String processes,
- @PathVariable Integer state,
- @RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
- }
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("productionScheduling.add")
@PostMapping("/addScheduling")
public Result addScheduling( @RequestBody Map<String,Object> object){
@@ -75,6 +70,7 @@
//鍒犻櫎鎺掍骇鏁版嵁
@ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("productionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
@@ -87,6 +83,7 @@
}
@ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
+ @SaCheckPermission("productionScheduling.review")
@PostMapping("/examineScheduling")
public Result examineScheduling( @RequestBody Map<String,Object> object){
@@ -98,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