From 583b80a582f9280a262ee72506d31d1bfa46f734 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 十二月 2025 11:29:57 +0800
Subject: [PATCH] 补交
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 94 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 37 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 6c5bfca..ba60fca 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
@@ -32,32 +32,43 @@
@ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
@PostMapping("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
- return Result.seccess(reportService.processCardProgressSv(orderId, columns));
+ return Result.success(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));
+ 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.seccess(reportService.processCardProgressCollectSv(orderId, 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.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+ return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate,reportTime, crossProcessBreakingDTO));
+
+ }
+
+ @ApiOperation("闈炶法宸ュ簭娆＄牬")
+ @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,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,
@@ -65,8 +76,9 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
+ @PathVariable String terminationVals,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));
+ return Result.success(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal,terminationVals, workInProgressDTO));
}
@@ -79,7 +91,7 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@RequestBody Report report) {
- return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ return Result.success(reportService.selectProcessToBeCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
}
@@ -92,19 +104,19 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@RequestBody Report report) {
- return Result.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ return Result.success(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
}
@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.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
+ return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate,reportTime, damageReportDTO));
}
@@ -113,7 +125,7 @@
public Result splittingDetailsOutside(
@PathVariable String orderId,
@RequestBody Report report) {
- return Result.seccess(reportService.splittingDetailsOutsideSv(orderId, report));
+ return Result.success(reportService.splittingDetailsOutsideSv(orderId, report));
}
@@ -123,35 +135,35 @@
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody Report report) {
- return Result.seccess(reportService.qualityReportSv(selectTime1, selectTime2, report));
+ return Result.success(reportService.qualityReportSv(selectTime1, selectTime2, report));
}
@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.seccess(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.seccess(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) {
- return Result.seccess(reportService.productionScheduleSv(orderId, columns));
+ public Result productionSchedule(@PathVariable String orderId, @RequestBody List<String> columns) {
+ return Result.success(reportService.productionScheduleSv(orderId, columns));
}
@ApiOperation("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
@@ -160,7 +172,7 @@
@PathVariable Date selectTime2,
@PathVariable String orderId,
@RequestBody List<Integer> columns) {
- return Result.seccess(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
+ return Result.success(reportService.taskCompletionStatusSv(selectTime1, selectTime2,orderId, columns));
}
@ApiOperation("璁㈠崟璁″垝鍒嗚В")
@@ -168,7 +180,7 @@
public Result orderPlanDecomposition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody Report report) {
- return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
+ return Result.success(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
}
@ApiOperation("璁㈠崟鎶ュ伐")
@@ -176,7 +188,7 @@
public Result orderReportingWorks(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody Report report) {
- return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
+ return Result.success(reportService.orderReportingWorks(selectTime1, selectTime2, report));
}
@ApiOperation("鍘熺墖棰嗘枡")
@@ -184,7 +196,7 @@
public Result rawMaterialRequisition(@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody Report report) {
- return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
+ return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
}
@ApiOperation("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
@@ -196,19 +208,26 @@
@PathVariable String selectTime2,
@PathVariable String selectProcesses,
@RequestBody TeamOutputDTO teamOutputDTO) {
- return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,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<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");
}
@@ -288,7 +307,7 @@
@PathVariable Date selectTime2,
@PathVariable String processes,
@RequestBody ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
- return Result.seccess(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
+ return Result.success(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));
}
@@ -311,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,
@@ -319,8 +338,9 @@
@PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
+ @PathVariable String terminationVal,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+ return Result.success(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal,terminationVal, workInProgressDTO));
}
@@ -334,7 +354,7 @@
@PathVariable String selectProcesses,
@PathVariable String optionVal,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.seccess(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
+ return Result.success(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
}
}
--
Gitblit v1.8.0