From 1d731a5de1774eb69fe48e6957db097fd65dd7d1 Mon Sep 17 00:00:00 2001 From: guoyuji <guoyujie@ng.com> Date: 星期四, 09 五月 2024 16:32:20 +0800 Subject: [PATCH] 基础数据添加玻璃类别功能 --- north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java index 8574f65..ac84714 100644 --- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java +++ b/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,40 @@ 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)); + + } + } -- Gitblit v1.8.0