From 6db03250bcbf51193b8dd71a698ea2b202c6d6ad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:20 +0800
Subject: [PATCH] 班组产量汇总报表，客户名称不能重复创建显示
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 30 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 6a094d7..498cf09 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,14 +109,14 @@
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
- @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}/{reportTime}")
public Result damageReport(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody DamageReportDTO damageReportDTO) {
- return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
+ return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate,reportTime, damageReportDTO));
}
@@ -138,29 +140,29 @@
}
@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));
}
@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));
}
@@ -197,35 +199,48 @@
return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
}
+ @ApiOperation("鐝粍浜ч噺姹囨�绘姤琛�")
+ @PostMapping("/TeamOutputSummary/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
+ public Result TeamOutputSummary(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
+ @PathVariable String selectProcesses,
+ @RequestBody TeamOutputDTO teamOutputDTO) {
+ return Result.success(reportService.TeamOutputSummarySv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
+
+ }
+
@ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
- @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
+ @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
public Result teamOutput(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@PathVariable String selectProcesses,
@RequestBody TeamOutputDTO teamOutputDTO) {
- return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
}
@ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
@PostMapping("/exportCrossProcessBreaking")
- public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> 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 {
+ public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃瀵煎嚭")
@PostMapping("/exportDamageReport")
- public void exportDamageReport(HttpServletResponse response, @RequestBody Map<String, Object> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportDamageReport(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, DamageReportDTO.class, reportService.exportDamageReportSv(dates), "DamageReport");
}
@@ -318,7 +333,7 @@
DownExcel.download(response, ScheduleProductionScheduleDTO.class, reportService.exportScheduleReportSv(dates), "ScheduleProduction");
}
- @ApiOperation("鐝粍浜ч噺瀵煎嚭")
+ @ApiOperation("鐝粍浜ч噺鏄庣粏瀵煎嚭")
@PostMapping("/exportTeamOutput")
public void exportTeamOutput(HttpServletResponse response,
@RequestBody Map<String, Object> dates
@@ -327,8 +342,17 @@
DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
}
+ @ApiOperation("鐝粍浜ч噺姹囨�诲鍑�")
+ @PostMapping("/exportTeamOutputSummary")
+ public void exportTeamOutputSummary(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates
+ ) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSummarySv(dates), "TeamOutput");
+ }
+
@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,
@@ -336,8 +360,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