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/ReportController.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 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 07627c2..6059b9d 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
@@ -38,25 +38,25 @@
 
     //娴佺▼鍗¤繘搴�
     @ApiOperation("娴佺▼鍗¤繘搴�")
-    @SaCheckPermission("ProcessCardProgress.search")
+    @SaCheckPermission("processCardProgress.search")
     @PostMapping("/processCardProgress/{orderId}")
     public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
         return Result.seccess(reportService.processCardProgressSv(orderId, columns));
     }
 
     @ApiOperation("璺ㄥ伐搴忔鐮�")
-    @SaCheckPermission("CrossProcessBreaking.search")
+    @SaCheckPermission("crossProcessBreaking.search")
     @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
     public Result getOrderReport(@PathVariable Integer pageNum,
                                  @PathVariable Integer pageSize,
                                  @PathVariable List<String> selectDate,
-                                 @RequestBody DamageDetails damageDetails) {
-        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, damageDetails));
+                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
+        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
 
     }
 
     @ApiOperation("鍦ㄥ埗鍝佹姤琛�")
-    @SaCheckPermission("WorkInProgress.search")
+    @SaCheckPermission("workInProgress.search")
     @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
     public Result workInProgress(
             @PathVariable Integer pageNum,
@@ -71,7 +71,7 @@
     }
 
     @ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
-    @SaCheckPermission("ProcessToBeCompleted.search")
+    @SaCheckPermission("processToBeCompleted.search")
     @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
     public Result selectProcessToBeCompleted(
             @PathVariable Date selectTime1,
@@ -85,7 +85,7 @@
     }
 
     @ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("DamageReport.search")
+    @SaCheckPermission("damageReport.search")
     @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
     public Result damageReport(
             @PathVariable Integer pageNum,
@@ -98,7 +98,7 @@
     }
 
     @ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("SplittingDetailsOutside.search")
+    @SaCheckPermission("splittingDetailsOutside.search")
     @PostMapping("/splittingDetailsOutside/{orderId}")
     public Result splittingDetailsOutside(
             @PathVariable String orderId,
@@ -108,7 +108,7 @@
     }
 
     @ApiOperation("鍝佽川鎶ヨ〃")
-    @SaCheckPermission("QualityReport.search")
+    @SaCheckPermission("qualityReport.search")
     @PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
     public Result qualityReport(
             @PathVariable Date selectTime1,
@@ -119,7 +119,7 @@
     }
 
     @ApiOperation("鎴愬搧鐜囨姤琛�")
-    @SaCheckPermission("Yield.search")
+    @SaCheckPermission("yield.search")
     @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
     public Result yield(
             @PathVariable Date selectTime1,
@@ -131,14 +131,14 @@
     }
 
     @ApiOperation("鐢熶骇鍙戣揣杩涘害")
-    @SaCheckPermission("ProductionSchedule.search")
+    @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")
+    @SaCheckPermission("taskCompletionStatus.search")
     @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}")
     public Result taskCompletionStatus(@PathVariable Date selectTime1,
                                        @PathVariable Date selectTime2,
@@ -147,7 +147,7 @@
     }
 
     @ApiOperation("璁㈠崟璁″垝鍒嗚В")
-    @SaCheckPermission("OrderPlanDecomposition.search")
+    @SaCheckPermission("orderPlanDecomposition.search")
     @PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
     public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
@@ -156,7 +156,7 @@
     }
 
     @ApiOperation("鍘熺墖棰嗘枡")
-    @SaCheckPermission("RawMaterialRequisition.search")
+    @SaCheckPermission("rawMaterialRequisition.search")
     @PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
     public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
@@ -165,7 +165,7 @@
     }
 
     @ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
-    @SaCheckPermission("DamageReport.search")
+    @SaCheckPermission("damageReport.search")
     @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
     public Result teamOutput(
             @PathVariable Integer pageNum,

--
Gitblit v1.8.0