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 | 139 +++++++++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 46 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 6638f64..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
@@ -29,33 +29,46 @@
}
//娴佺▼鍗¤繘搴�
- @ApiOperation("娴佺▼鍗¤繘搴�")
- @SaCheckPermission("selectOrder.search")
+ @ApiOperation("璁㈠崟娴佺▼鍗¤繘搴�")
@PostMapping("/processCardProgress/{orderId}")
- public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
- return Result.seccess(reportService.processCardProgressSv(orderId, columns));
+ public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
+ return Result.success(reportService.processCardProgressSv(orderId, columns));
+ }
+ @ApiOperation("鎶ヨ〃娴佺▼鍗¤繘搴�")
+ @PostMapping("/processCardProgressReport/{orderId}")
+ public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<String> columns) {
+ return Result.success(reportService.processCardProgressReportSv(orderId, columns));
}
@ApiOperation("娴佺▼鍗¤繘搴︽眹鎬�")
- @SaCheckPermission("selectOrder.search")
@PostMapping("/processCardProgressCollect/{orderId}")
- public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<Integer> columns) {
- return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
+ public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
+ return Result.success(reportService.processCardProgressCollectSv(orderId, columns));
}
@ApiOperation("璺ㄥ伐搴忔鐮�")
- @SaCheckPermission("crossProcessBreaking.search")
- @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("鍦ㄥ埗鍝佹姤琛�")
- @SaCheckPermission("workInProgress.search")
- @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,
@@ -63,13 +76,13 @@
@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));
}
@ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
- @SaCheckPermission("processToBeCompleted.search")
@PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
public Result selectProcessToBeCompleted(
@PathVariable Date selectTime1,
@@ -78,102 +91,115 @@
@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));
+
+ }
+
+ @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.success(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
- @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));
}
@ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃")
- @SaCheckPermission("splittingDetailsOutside.search")
@PostMapping("/splittingDetailsOutside/{orderId}")
public Result splittingDetailsOutside(
@PathVariable String orderId,
@RequestBody Report report) {
- return Result.seccess(reportService.splittingDetailsOutsideSv(orderId, report));
+ return Result.success(reportService.splittingDetailsOutsideSv(orderId, report));
}
@ApiOperation("鍝佽川鎶ヨ〃")
- @SaCheckPermission("qualityReport.search")
@PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
public Result qualityReport(
@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("鎴愬搧鐜囨姤琛�")
- @SaCheckPermission("yield.search")
- @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
+ @PostMapping("/yield/{selectDate}/{selectProcesses}/{reportTime}")
public Result yield(
- @PathVariable Date selectTime1,
- @PathVariable Date 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/{selectDate}/{reportTime}")
+ public Result yieldProcess(
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
+ @RequestBody Report report) {
+ return Result.success(reportService.yieldProcessSv(selectDate,reportTime, report));
}
@ApiOperation("鐢熶骇鍙戣揣杩涘害")
- @SaCheckPermission("productionSchedule.search")
@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("浠诲姟瀹屾垚鎯呭喌姹囨�昏繘搴�")
- @SaCheckPermission("taskCompletionStatus.search")
@PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}/{orderId}")
public Result taskCompletionStatus(@PathVariable Date selectTime1,
@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("璁㈠崟璁″垝鍒嗚В")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
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("璁㈠崟鎶ュ伐")
- @SaCheckPermission("orderPlanDecomposition.search")
@PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
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("鍘熺墖棰嗘枡")
- @SaCheckPermission("rawMaterialRequisition.search")
@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
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("鐝粍浜ч噺鏄庣粏鎶ヨ〃")
- @SaCheckPermission("damageReport.search")
@PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
public Result teamOutput(
@PathVariable Integer pageNum,
@@ -182,7 +208,7 @@
@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("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
@@ -190,6 +216,13 @@
public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> 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 {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃瀵煎嚭")
@@ -274,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));
}
@@ -297,8 +330,7 @@
}
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
- @SaCheckPermission("workInProgress.search")
- @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,
@@ -306,8 +338,23 @@
@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));
+
+ }
+
+ @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
+ @PostMapping("/workInProgressCombinationProcess/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
+ public Result workInProgressCombinationProcess(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @PathVariable String optionVal,
+ @RequestBody WorkInProgressDTO workInProgressDTO) {
+ return Result.success(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
}
}
--
Gitblit v1.8.0