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

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

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

@@ -32,18 +32,17 @@
    @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("跨工序次破")
@@ -52,12 +51,22 @@
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
        return Result.success(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));

    }

    @ApiOperation("非跨工序次破")
    @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, 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 +74,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 +89,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 +102,18 @@
            @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}")
    public Result damageReport(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable List<String> selectDate,
            @RequestBody DamageReportDTO damageReportDTO) {
        return Result.seccess(reportService.selectDamageReportSv(pageNum, pageSize, selectTime1, selectTime2, damageReportDTO));
        return Result.success(reportService.selectDamageReportSv(pageNum, pageSize, selectDate, damageReportDTO));

    }

@@ -113,7 +122,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,7 +132,7 @@
            @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));

    }

@@ -134,7 +143,7 @@
            @PathVariable String selectTime2,
            @PathVariable String selectProcesses,
            @RequestBody Report report) {
        return Result.seccess(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
        return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));

    }

@@ -144,14 +153,14 @@
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @RequestBody Report report) {
        return Result.seccess(reportService.yieldProcessSv(selectTime1, selectTime2, report));
        return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, 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 +169,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 +177,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 +185,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 +193,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,7 +205,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("跨工序次破报表导出")
@@ -204,6 +213,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("次破明细报表导出")
@@ -288,7 +304,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 +327,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 +335,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));

    }
}