From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 c78fc33..411f170 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
@@ -40,7 +40,6 @@
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.success(reportService.processCardProgressCollectSv(orderId, columns));
@@ -67,7 +66,7 @@
}
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
- @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}/{terminationVals}")
public Result workInProgress(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -75,8 +74,9 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
+ @PathVariable String terminationVals,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.success(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
+ return Result.success(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal,terminationVals, workInProgressDTO));
}
@@ -159,7 +159,7 @@
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
@PostMapping("/productionSchedule/{orderId}")
- public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ public Result productionSchedule(@PathVariable String orderId, @RequestBody List<String> columns) {
return Result.success(reportService.productionScheduleSv(orderId, columns));
}
@@ -327,7 +327,7 @@
}
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
- @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}/{terminationVal}")
public Result workInProgressCombination(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@@ -335,8 +335,9 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
+ @PathVariable String terminationVal,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.success(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+ return Result.success(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal,terminationVal, workInProgressDTO));
}
--
Gitblit v1.8.0