Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-07 2abec00842a87162186406af7c2014aae948af49

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

@@ -67,7 +67,7 @@
    }

    @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 +75,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 +108,13 @@
    }

    @ApiOperation("次破明细报表")
    @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
    @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectDate}")
    public Result damageReport(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable List<String> selectDate,
            @RequestBody DamageReportDTO damageReportDTO) {
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate, damageReportDTO));

    }

@@ -160,7 +160,7 @@

    @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));
    }

@@ -328,7 +328,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,
@@ -336,8 +336,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));

    }