From 5cd9288f8ff95696ebbb88fa9c5a7f0322aeb699 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 28 十月 2025 13:42:31 +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/ReportController.java |   71 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 20 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 1a8f7e0..6a094d7 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
@@ -32,18 +32,18 @@
     @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
     @PostMapping("/processCardProgress/{orderId}")
     public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
-        return Result.seccess(reportService.processCardProgressSv(orderId, columns));
+        return Result.success(reportService.processCardProgressSv(orderId, columns));
     }
     @ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")
     @PostMapping("/processCardProgressReport/{orderId}")
     public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<String> columns) {
-        return Result.seccess(reportService.processCardProgressReportSv(orderId, columns));
+        return Result.success(reportService.processCardProgressReportSv(orderId, columns));
     }
     @ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
     @SaCheckPermission("selectOrder.search")
     @PostMapping("/processCardProgressCollect/{orderId}")
     public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
-        return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
+        return Result.success(reportService.processCardProgressCollectSv(orderId, columns));
     }
 
     @ApiOperation("璺ㄥ伐搴忔鐮�")
@@ -52,7 +52,17 @@
                                  @PathVariable Integer pageSize,
                                  @PathVariable List<String> selectDate,
                                  @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
-        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+        return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+
+    }
+
+    @ApiOperation("闈炶法宸ュ簭娆＄牬")
+    @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+    public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
+                                 @PathVariable Integer pageSize,
+                                 @PathVariable List<String> selectDate,
+                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
+        return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
 
     }
 
@@ -66,7 +76,7 @@
             @PathVariable String selectProcesses,
             @PathVariable String optionVal,
             @RequestBody WorkInProgressDTO workInProgressDTO) {
-        return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
+        return Result.success(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
 
     }
 
@@ -79,7 +89,7 @@
             @PathVariable String inputProject,
             @PathVariable String selectProcesses,
             @RequestBody Report report) {
-        return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+        return Result.success(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
 
     }
 
@@ -92,7 +102,7 @@
             @PathVariable String inputProject,
             @PathVariable String selectProcesses,
             @RequestBody Report report) {
-        return Result.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+        return Result.success(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
 
     }
 
@@ -104,7 +114,7 @@
             @PathVariable String selectTime1,
             @PathVariable String selectTime2,
             @RequestBody DamageReportDTO damageReportDTO) {
-        return Result.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
+        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
 
     }
 
@@ -113,7 +123,7 @@
     public Result splittingDetailsOutside(
             @PathVariable String orderId,
             @RequestBody Report report) {
-        return Result.seccess(reportService.splittingDetailsOutsideSv(orderId, report));
+        return Result.success(reportService.splittingDetailsOutsideSv(orderId, report));
 
     }
 
@@ -123,7 +133,7 @@
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2,
             @RequestBody Report report) {
-        return Result.seccess(reportService.qualityReportSv(selectTime1, selectTime2, report));
+        return Result.success(reportService.qualityReportSv(selectTime1, selectTime2, report));
 
     }
 
@@ -134,7 +144,7 @@
             @PathVariable String selectTime2,
             @PathVariable String selectProcesses,
             @RequestBody Report report) {
-        return Result.seccess(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
+        return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
 
     }
 
@@ -144,14 +154,14 @@
             @PathVariable String selectTime1,
             @PathVariable String selectTime2,
             @RequestBody Report report) {
-        return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
+        return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, report));
 
     }
 
     @ApiOperation("鐢熶骇鍙戣揣杩涘害")
     @PostMapping("/productionSchedule/{orderId}")
     public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
-        return Result.seccess(reportService.productionScheduleSv(orderId, columns));
+        return Result.success(reportService.productionScheduleSv(orderId, columns));
     }
 
     @ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
@@ -160,7 +170,7 @@
                                        @PathVariable Date selectTime2,
                                        @PathVariable String orderId,
                                        @RequestBody List<Integer> columns) {
-        return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
+        return Result.success(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
     }
 
     @ApiOperation("璁㈠崟璁″垝鍒嗚В")
@@ -168,7 +178,7 @@
     public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
                                          @RequestBody Report report) {
-        return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
+        return Result.success(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
     }
 
     @ApiOperation("璁㈠崟鎶ュ伐")
@@ -176,7 +186,7 @@
     public Result orderReportingWorks(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
                                          @RequestBody Report report) {
-        return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
+        return Result.success(reportService.orderReportingWorks(selectTime1, selectTime2, report));
     }
 
     @ApiOperation("鍘熺墖棰嗘枡")
@@ -184,7 +194,7 @@
     public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                          @PathVariable Date selectTime2,
                                          @RequestBody Report report) {
-        return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
+        return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
     }
 
     @ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
@@ -196,7 +206,7 @@
             @PathVariable String selectTime2,
             @PathVariable String selectProcesses,
             @RequestBody TeamOutputDTO teamOutputDTO) {
-        return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+        return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
 
     }
     @ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
@@ -204,6 +214,13 @@
     public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
         //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
         DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportCrossProcessBreakingSv(dates), "CrossProcessBreaking");
+    }
+
+    @ApiOperation("闈炶法宸ュ簭娆＄牬鎶ヨ〃瀵煎嚭")
+    @PostMapping("/exportNotCrossProcessBreaking")
+    public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+        //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+        DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
     }
 
     @ApiOperation("娆＄牬鏄庣粏鎶ヨ〃瀵煎嚭")
@@ -288,7 +305,7 @@
             @PathVariable Date selectTime2,
             @PathVariable String processes,
             @RequestBody ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
-        return Result.seccess(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
+        return Result.success(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
 
     }
 
@@ -320,7 +337,21 @@
             @PathVariable String selectProcesses,
             @PathVariable String optionVal,
             @RequestBody WorkInProgressDTO workInProgressDTO) {
-        return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+        return Result.success(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+
+    }
+
+    @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
+    @PostMapping("/workInProgressCombinationProcess/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+    public Result workInProgressCombinationProcess(
+            @PathVariable Integer pageNum,
+            @PathVariable Integer pageSize,
+            @PathVariable String orderId,
+            @PathVariable String inputProject,
+            @PathVariable String selectProcesses,
+            @PathVariable String optionVal,
+            @RequestBody WorkInProgressDTO workInProgressDTO) {
+        return Result.success(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
 
     }
 }

--
Gitblit v1.8.0