报工返工补片添加日志

chenlu

2024-07-18 7c4fb2ba6509a609855a6572125a680ceb27b339

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

@@ -57,16 +57,14 @@

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

    }

@@ -248,4 +246,26 @@
        DownExcel.download(response, YieldDTO.class, reportService.exportYieldSv(dates), "Yield");
    }

    @ApiOperation("排产订单信息报表")
    @PostMapping("/scheduleProductionSchedule/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{processes}")
    public Result scheduleProductionSchedule(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String processes,
            @RequestBody ScheduleProductionScheduleDTO scheduleProductionScheduleDTO) {
        return Result.seccess(reportService.scheduleProductionScheduleSv(pageNum, pageSize, selectTime1, selectTime2,processes, scheduleProductionScheduleDTO));

    }

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