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

guoyujie

2 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

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

@@ -38,38 +38,40 @@

    //流程卡进度
    @ApiOperation("流程卡进度")
    @SaCheckPermission("ProcessCardProgress.search")
    @SaCheckPermission("processCardProgress.search")
    @PostMapping("/processCardProgress/{orderId}")
    public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
        return Result.seccess(reportService.processCardProgressSv(orderId, columns));
    }

    @ApiOperation("跨工序次破")
    @SaCheckPermission("CrossProcessBreaking.search")
    @SaCheckPermission("crossProcessBreaking.search")
    @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
    public Result getOrderReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody DamageDetails damageDetails) {
        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, damageDetails));
                                 @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
        return Result.seccess(reportService.crossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));

    }

    @ApiOperation("在制品报表")
    @SaCheckPermission("WorkInProgress.search")
    @PostMapping("/workInProgress/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
    @SaCheckPermission("workInProgress.search")
    @PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
    public Result workInProgress(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable String orderId,
            @PathVariable String inputProject,
            @PathVariable String selectProcesses,
            @PathVariable String optionVal,
            @RequestBody Report report) {
        return Result.seccess(reportService.workInProgressSv( orderId, inputProject, selectProcesses,optionVal, report));
            @RequestBody WorkInProgressDTO workInProgressDTO) {
        return Result.seccess(reportService.workInProgressSv(pageNum, pageSize, orderId, inputProject, selectProcesses,optionVal, workInProgressDTO));

    }

    @ApiOperation("工序待完成报表")
    @SaCheckPermission("ProcessToBeCompleted.search")
    @SaCheckPermission("processToBeCompleted.search")
    @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
    public Result selectProcessToBeCompleted(
            @PathVariable Date selectTime1,
@@ -83,7 +85,7 @@
    }

    @ApiOperation("次破明细报表")
    @SaCheckPermission("DamageReport.search")
    @SaCheckPermission("damageReport.search")
    @PostMapping("/damageReport/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
    public Result damageReport(
            @PathVariable Integer pageNum,
@@ -96,7 +98,7 @@
    }

    @ApiOperation("分架明细报表")
    @SaCheckPermission("SplittingDetailsOutside.search")
    @SaCheckPermission("splittingDetailsOutside.search")
    @PostMapping("/splittingDetailsOutside/{orderId}")
    public Result splittingDetailsOutside(
            @PathVariable String orderId,
@@ -106,7 +108,7 @@
    }

    @ApiOperation("品质报表")
    @SaCheckPermission("QualityReport.search")
    @SaCheckPermission("qualityReport.search")
    @PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
    public Result qualityReport(
            @PathVariable Date selectTime1,
@@ -117,7 +119,7 @@
    }

    @ApiOperation("成品率报表")
    @SaCheckPermission("Yield.search")
    @SaCheckPermission("yield.search")
    @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
    public Result yield(
            @PathVariable Date selectTime1,
@@ -129,14 +131,14 @@
    }

    @ApiOperation("生产发货进度")
    @SaCheckPermission("ProductionSchedule.search")
    @SaCheckPermission("productionSchedule.search")
    @PostMapping("/productionSchedule/{orderId}")
    public Result productionSchedule(@PathVariable String orderId, @RequestBody List<Integer> columns) {
        return Result.seccess(reportService.productionScheduleSv(orderId, columns));
    }

    @ApiOperation("任务完成情况汇总进度")
    @SaCheckPermission("TaskCompletionStatus.search")
    @SaCheckPermission("taskCompletionStatus.search")
    @PostMapping("/taskCompletionStatus/{selectTime1}/{selectTime2}")
    public Result taskCompletionStatus(@PathVariable Date selectTime1,
                                       @PathVariable Date selectTime2,
@@ -145,7 +147,7 @@
    }

    @ApiOperation("订单计划分解")
    @SaCheckPermission("OrderPlanDecomposition.search")
    @SaCheckPermission("orderPlanDecomposition.search")
    @PostMapping("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
    public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
@@ -153,8 +155,17 @@
        return Result.seccess(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));
    }

    @ApiOperation("原片领料")
    @SaCheckPermission("RawMaterialRequisition.search")
    @SaCheckPermission("rawMaterialRequisition.search")
    @PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
    public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
@@ -163,7 +174,7 @@
    }

    @ApiOperation("班组产量明细报表")
    @SaCheckPermission("DamageReport.search")
    @SaCheckPermission("damageReport.search")
    @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
    public Result teamOutput(
            @PathVariable Integer pageNum,
@@ -259,13 +270,21 @@

    }

    @ApiOperation("订单排产计划")
    @ApiOperation("订单排产计划导出")
    @PostMapping("/exportScheduleReport")
    public void exportScheduleReport(HttpServletResponse response,
                                     @RequestBody Map<String, Object> dates
    ) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        System.out.println(dates);
        DownExcel.download(response, ScheduleProductionScheduleDTO.class, reportService.exportScheduleReportSv(dates), "ScheduleProduction");
    }

    @ApiOperation("班组产量导出")
    @PostMapping("/exportTeamOutput")
    public void exportTeamOutput(HttpServletResponse response,
                                     @RequestBody Map<String, Object> dates
    ) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
    }
}