From b4ecc2c68b386b53caf7f19b8366ec2332ef1e9f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 29 八月 2024 15:30:19 +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 | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 c953e0c..07627c2 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
@@ -57,16 +57,16 @@
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
@SaCheckPermission("WorkInProgress.search")
- @PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
@PathVariable String orderId,
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
- @RequestBody Report report) {
- return Result.seccess(reportService.workInProgressSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses,optionVal, report));
+ @RequestBody WorkInProgressDTO workInProgressDTO) {
+ return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
}
@@ -248,4 +248,34 @@
DownExcel.download(response, YieldDTO.class, reportService.exportYieldSv(dates), "Yield");
}
+ @ApiOperation("鎺掍骇璁㈠崟淇℃伅鎶ヨ〃")
+ @PostMapping("/scheduleProductionSchedule/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{processes}")
+ public Result scheduleProductionSchedule(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String processes,
+ @RequestBody ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
+ return Result.seccess(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
+
+ }
+
+ @ApiOperation("璁㈠崟鎺掍骇璁″垝瀵煎嚭")
+ @PostMapping("/exportScheduleReport")
+ public void exportScheduleReport(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates
+ ) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, ScheduleProductionScheduleDTO.class, reportService.exportScheduleReportSv(dates), "ScheduleProduction");
+ }
+
+ @ApiOperation("鐝粍浜ч噺瀵煎嚭")
+ @PostMapping("/exportTeamOutput")
+ public void exportTeamOutput(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates
+ ) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
+ }
}
--
Gitblit v1.8.0