From fd2ec4214c6f8456b957c3545e7d67bcdbbb9985 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 02 十二月 2025 15:26:33 +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 | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 e75dfb3..32a6f69 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,34 +40,35 @@
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));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
- @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+ @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
public Result getOrderReport(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
- return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+ return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate,reportTime, crossProcessBreakingDTO));
}
@ApiOperation("闈炶法宸ュ簭娆＄牬")
- @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+ @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
- return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+ return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate,reportTime, crossProcessBreakingDTO));
}
@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 +76,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));
}
@@ -107,13 +109,14 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
- @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}")
+ @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
public Result damageReport(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody DamageReportDTO damageReportDTO) {
- return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate, damageReportDTO));
+ return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate,reportTime, damageReportDTO));
}
@@ -137,23 +140,23 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
- @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
+ @PostMapping("/yield/{selectDate}/{selectProcesses}/{reportTime}")
public Result yield(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String selectProcesses,
+ @PathVariable String reportTime,
@RequestBody Report report) {
- return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
+ return Result.success(reportService.yieldSv(selectDate, selectProcesses,reportTime, report));
}
@ApiOperation("鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�")
- @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
+ @PostMapping("/yieldProcess/{selectDate}/{reportTime}")
public Result yieldProcess(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody Report report) {
- return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, report));
+ return Result.success(reportService.yieldProcessSv(selectDate,reportTime, report));
}
@@ -327,7 +330,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 +338,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