chenlu
10 小时以前 6db03250bcbf51193b8dd71a698ea2b202c6d6ad
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -199,16 +199,29 @@
        return Result.success(reportService.rawMaterialRequisitionSv(selectTime1, selectTime2, report));
    }
    @ApiOperation("班组产量汇总报表")
    @PostMapping("/TeamOutputSummary/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
    public Result TeamOutputSummary(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable List<String> selectDate,
            @PathVariable String reportTime,
            @PathVariable String selectProcesses,
            @RequestBody TeamOutputDTO teamOutputDTO) {
        return Result.success(reportService.TeamOutputSummarySv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
    }
    @ApiOperation("班组产量明细报表")
    @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{selectProcesses}")
    @PostMapping("/teamOutput/{pageNum}/{pageSize}/{selectDate}/{reportTime}/{selectProcesses}")
    public Result teamOutput(
            @PathVariable Integer pageNum,
            @PathVariable Integer pageSize,
            @PathVariable String selectTime1,
            @PathVariable String selectTime2,
            @PathVariable List<String> selectDate,
            @PathVariable String reportTime,
            @PathVariable String selectProcesses,
            @RequestBody TeamOutputDTO teamOutputDTO) {
        return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
        return Result.success(reportService.teamOutputSv(pageNum, pageSize, selectDate, reportTime,selectProcesses, teamOutputDTO));
    }
    @ApiOperation("跨工序次破报表导出")
@@ -320,7 +333,7 @@
        DownExcel.download(response, ScheduleProductionScheduleDTO.class, reportService.exportScheduleReportSv(dates), "ScheduleProduction");
    }
    @ApiOperation("班组产量导出")
    @ApiOperation("班组产量明细导出")
    @PostMapping("/exportTeamOutput")
    public void exportTeamOutput(HttpServletResponse response,
                                     @RequestBody Map<String, Object> dates
@@ -329,6 +342,15 @@
        DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
    }
    @ApiOperation("班组产量汇总导出")
    @PostMapping("/exportTeamOutputSummary")
    public void exportTeamOutputSummary(HttpServletResponse response,
                                 @RequestBody Map<String, Object> dates
    ) throws IOException, IllegalAccessException, InstantiationException {
        //参数:相应的数据,实体类信息,相应的方法(数据获取),生成的excel名字
        DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSummarySv(dates), "TeamOutput");
    }
    @ApiOperation("在制品汇总报表")
    @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}/{terminationVal}")
    public Result workInProgressCombination(