From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 8f64b3d..96bdcb1 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -29,15 +29,24 @@
     }
 
     //娴佺▼鍗¤繘搴�
-    @ApiOperation("娴佺▼鍗¤繘搴�")
-    @SaCheckPermission("selectOrder.search")
+    @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
     @PostMapping("/processCardProgress/{orderId}")
     public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
         return Result.seccess(reportService.processCardProgressSv(orderId, columns));
     }
+    @ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")
+    @PostMapping("/processCardProgressReport/{orderId}")
+    public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+        return Result.seccess(reportService.processCardProgressReportSv(orderId, columns));
+    }
+    @ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
+    @SaCheckPermission("selectOrder.search")
+    @PostMapping("/processCardProgressCollect/{orderId}")
+    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+        return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
+    }
 
     @ApiOperation("璺ㄥ伐搴忔鐮�")
-    @SaCheckPermission("crossProcessBreaking.search")
     @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
     public Result getOrderReport(@PathVariable Integer pageNum,
                                  @PathVariable Integer pageSize,
@@ -48,7 +57,6 @@
     }
 
     @ApiOperation("鍦ㄥ埗鍝佹姤琛�")
-    @SaCheckPermission("workInProgress.search")
     @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
     public Result workInProgress(
             @PathVariable Integer pageNum,
@@ -63,7 +71,6 @@
     }
 
     @ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
-    @SaCheckPermission("processToBeCompleted.search")
     @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
     public Result selectProcessToBeCompleted(
             @PathVariable Date selectTime1,
@@ -77,7 +84,6 @@
     }
 
     @ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("damageReport.search")
     @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
     public Result damageReport(
             @PathVariable Integer pageNum,
@@ -90,7 +96,6 @@
     }
 
     @ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("splittingDetailsOutside.search")
     @PostMapping("/splittingDetailsOutside/{orderId}")
     public Result splittingDetailsOutside(
             @PathVariable String orderId,
@@ -100,7 +105,6 @@
     }
 
     @ApiOperation("鍝佽川鎶ヨ〃")
-    @SaCheckPermission("qualityReport.search")
     @PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
     public Result qualityReport(
             @PathVariable Date selectTime1,
@@ -111,7 +115,6 @@
     }
 
     @ApiOperation("鎴愬搧鐜囨姤琛�")
-    @SaCheckPermission("yield.search")
     @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
     public Result yield(
             @PathVariable Date selectTime1,
@@ -123,23 +126,21 @@
     }
 
     @ApiOperation("鐢熶骇鍙戣揣杩涘害")
-    @SaCheckPermission("productionSchedule.search")
     @PostMapping("/productionSchedule/{orderId}")
     public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
         return Result.seccess(reportService.productionScheduleSv(orderId, columns));
     }
 
     @ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
-    @SaCheckPermission("taskCompletionStatus.search")
-    @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}")
+    @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}/{orderId}")
     public Result taskCompletionStatus(@PathVariable Date selectTime1,
                                        @PathVariable Date selectTime2,
+                                       @PathVariable String orderId,
                                        @RequestBody List<Integer> columns) {
-        return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2, columns));
+        return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
     }
 
     @ApiOperation("璁㈠崟璁″垝鍒嗚В")
-    @SaCheckPermission("orderPlanDecomposition.search")
     @PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
     public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
@@ -148,7 +149,6 @@
     }
 
     @ApiOperation("璁㈠崟鎶ュ伐")
-    @SaCheckPermission("orderPlanDecomposition.search")
     @PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
     public Result orderReportingWorks(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
@@ -157,7 +157,6 @@
     }
 
     @ApiOperation("鍘熺墖棰嗘枡")
-    @SaCheckPermission("rawMaterialRequisition.search")
     @PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
     public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
@@ -166,7 +165,6 @@
     }
 
     @ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("damageReport.search")
     @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
     public Result teamOutput(
             @PathVariable Integer pageNum,
@@ -290,7 +288,6 @@
     }
 
     @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
-    @SaCheckPermission("workInProgress.search")
     @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
     public Result workInProgressCombination(
             @PathVariable Integer pageNum,

--
Gitblit v1.8.0