Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-10-27 a3ad909e75ddb7a6271d95704dc002cc70337fd5

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java

@@ -36,13 +36,13 @@
    }
    @ApiOperation("报表流程卡进度")
    @PostMapping("/processCardProgressReport/{orderId}")
    public Result processCardProgressReport(@PathVariable String orderId, @RequestBody List<Integer> columns) {
    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<Integer> columns) {
    public Result processCardProgressCollect(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressCollectSv(orderId, columns));
    }

@@ -80,6 +80,19 @@
            @PathVariable String selectProcesses,
            @RequestBody Report report) {
        return Result.seccess(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.seccess(reportService.selectProcessCompletedSv(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));

    }

@@ -310,4 +323,18 @@
        return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, 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.seccess(reportService.workInProgressCombinationProcessSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));

    }
}