chenlu
2025-09-22 7ee68df04b7a169d51ab95ad9955276c9aff6ee1
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -31,18 +31,18 @@
    //流程卡进度
    @ApiOperation("订单流程卡进度")
    @PostMapping("/processCardProgress/{orderId}")
    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<String> columns) {
        return Result.seccess(reportService.processCardProgressSv(orderId, columns));
    }
    @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));
    }
@@ -125,6 +125,16 @@
    }
    @ApiOperation("成品率工序汇总报表")
    @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
    public Result yieldProcess(
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @RequestBody Report report) {
        return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
    }
    @ApiOperation("生产发货进度")
    @PostMapping("/productionSchedule/{orderId}")
    public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {