From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 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..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
@@ -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,
@@ -29,44 +31,37 @@
             @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("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
-    @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.success(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){
 
         if(productionSchedulingService.addSchedulingSv(object)){
-            return Result.seccess();
+            return Result.success();
         }else {
             throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
 
@@ -75,11 +70,12 @@
 
     //鍒犻櫎鎺掍骇鏁版嵁
     @ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
+    @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,"鍒犻櫎澶辫触");
 
@@ -87,15 +83,29 @@
     }
 
     @ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
+    @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