From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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, 38 insertions(+), 4 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 3a6f32e..1a8f7e0 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,10 +29,21 @@
}
//娴佺▼鍗¤繘搴�
- @ApiOperation("娴佺▼鍗¤繘搴�")
+ @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
@PostMapping("/processCardProgress/{orderId}")
- public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
+ public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
return Result.seccess(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));
+ }
+ @ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
+ @SaCheckPermission("selectOrder.search")
+ @PostMapping("/processCardProgressCollect/{orderId}")
+ public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
+ return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
@@ -72,6 +83,19 @@
}
+ @ApiOperation("宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�")
+ @PostMapping("/selectProcessCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result selectProcessCompleted(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+
+ }
+
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
@PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result damageReport(
@@ -106,14 +130,24 @@
@ApiOperation("鎴愬搧鐜囨姤琛�")
@PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result yield(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
@PathVariable String selectProcesses,
@RequestBody Report report) {
return Result.seccess(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
}
+ @ApiOperation("鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�")
+ @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
+ public Result yieldProcess(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
+
+ }
+
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
@PostMapping("/productionSchedule/{orderId}")
public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
--
Gitblit v1.8.0