From 2a7adfe776c3c7e0aad9405cfd4cc86b2d1c134b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 20 五月 2024 11:41:20 +0800
Subject: [PATCH] 添加订单根据产品分类报表功能
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 133 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 insertions(+), 5 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 6ebc1c9..adc050d 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
@@ -1,8 +1,12 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
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;
@@ -13,21 +17,140 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@Api(value="鐢熶骇鎶ヨ〃controller",tags={"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
@RequestMapping("/report")
public class ReportController {
- @Autowired
- ReportService reportService;
+ private final ReportService reportService;
+
+ public ReportController(ReportService reportService) {
+ this.reportService = reportService;
+ }
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
+ @SaCheckPermission("ProcessCardProgress.search")
@PostMapping ("/processCardProgress/{orderId}")
- public Result processCardProgress(
+ public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
+ return Result.seccess(reportService.processCardProgressSv(orderId,columns));
+ }
+
+ @ApiOperation("璺ㄥ伐搴忔鐮�")
+ @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));
+
+ }
+
+ @ApiOperation("鍦ㄥ埗鍝佹姤琛�")
+ @SaCheckPermission("WorkInProgress.search")
+ @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("宸ュ簭寰呭畬鎴愭姤琛�")
+ @SaCheckPermission("ProcessToBeCompleted.search")
+ @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result selectProcessToBeCompleted(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
@PathVariable String orderId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(reportService.processCardProgressSv(orderId,flowCard));
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));
+
+ }
+
+ @ApiOperation("娆＄牬鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("DamageReport.search")
+ @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("鍒嗘灦鏄庣粏鎶ヨ〃")
+ @SaCheckPermission("SplittingDetailsOutside.search")
+ @PostMapping("/splittingDetailsOutside/{orderId}")
+ public Result splittingDetailsOutside(
+ @PathVariable String orderId,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.splittingDetailsOutsideSv(orderId,report));
+
+ }
+
+ @ApiOperation("鍝佽川鎶ヨ〃")
+ @SaCheckPermission("QualityReport.search")
+ @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("鎴愬搧鐜囨姤琛�")
+ @SaCheckPermission("Yield.search")
+ @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("鐢熶骇鍙戣揣杩涘害")
+ @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")
+ @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("璁㈠崟璁″垝鍒嗚В")
+ @SaCheckPermission("OrderPlanDecomposition.search")
+ @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("鍘熺墖棰嗘枡")
+ @SaCheckPermission("RawMaterialRequisition.search")
+ @PostMapping ("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
+ public Result rawMaterialRequisition(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report){
+ return Result.seccess(reportService.rawMaterialRequisitionSv(selectTime1,selectTime2,report));
}
}
--
Gitblit v1.8.0