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

chenlu

2024-05-13 d35d14bc183e7275e79cb64537ce28dc83f271f0

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

@@ -2,7 +2,10 @@

import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Report;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportService;
@@ -33,4 +36,108 @@
        return Result.seccess(reportService.processCardProgressSv(orderId,columns));
    }

    @ApiOperation("跨工序次破")
    @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));

    }

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

    }

    @ApiOperation("工序待完成报表")
    @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
    public Result selectProcessToBeCompleted(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String orderId,
            @PathVariable String inputProject,
            @PathVariable String selectProcesses,
            @RequestBody Report report)  {
        return  Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));

    }

    @ApiOperation("次破明细报表")
    @PostMapping("/damageReport/{selectTime1}/{selectTime2}")
    public Result damageReport(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody Report report)  {
        return  Result.seccess(reportService.selectDamageReportSv(selectTime1,selectTime2,report));

    }
    @ApiOperation("分架明细报表")
    @PostMapping("/splittingDetailsOutside/{orderId}")
    public Result splittingDetailsOutside(
            @PathVariable String orderId,
            @RequestBody Report report)  {
        return  Result.seccess(reportService.splittingDetailsOutsideSv(orderId,report));

    }

    @ApiOperation("品质报表")
    @PostMapping("/qualityReport/{selectTime1}/{selectTime2}")
    public Result qualityReport(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @RequestBody Report report)  {
        return  Result.seccess(reportService.qualityReportSv(selectTime1,selectTime2,report));

    }

    @ApiOperation("成品率报表")
    @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
    public Result yield(
            @PathVariable Date selectTime1,
            @PathVariable Date selectTime2,
            @PathVariable String selectProcesses,
            @RequestBody Report report)  {
        return  Result.seccess(reportService.yieldSv(selectTime1,selectTime2,selectProcesses,report));

    }

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

    @ApiOperation("任务完成情况汇总进度")
    @PostMapping  ("/taskCompletionStatus/{selectTime1}/{selectTime2}")
    public Result taskCompletionStatus(@PathVariable Date selectTime1,
                                       @PathVariable Date selectTime2,
                                       @RequestBody List<Integer> columns){
        return Result.seccess(reportService.taskCompletionStatusSv(selectTime1,selectTime2,columns));
    }

    @ApiOperation("订单计划分解")
    @PostMapping  ("/orderPlanDecomposition/{selectTime1}/{selectTime2}")
    public Result orderPlanDecomposition(@PathVariable Date selectTime1,
                                       @PathVariable Date selectTime2,
                                         @RequestBody Report report){
        return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1,selectTime2,report));
    }

    @ApiOperation("原片领料")
    @PostMapping  ("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
    public Result rawMaterialRequisition(@PathVariable Date selectTime1,
                                         @PathVariable Date selectTime2,
                                         @RequestBody Report report){
        return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1,selectTime2,report));
    }
}