From 16bbf8260110e2790f304e8421cf7591837ca302 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 14 七月 2025 11:16:06 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 6059b9d..42d6362 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
@@ -25,6 +25,7 @@
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ExecutionException;
@RestController
@Api(value = "鐢熶骇鎶ヨ〃controller", tags = {"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
@@ -38,7 +39,7 @@
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
- @SaCheckPermission("processCardProgress.search")
+ @SaCheckPermission("selectOrder.search")
@PostMapping("/processCardProgress/{orderId}")
public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
return Result.seccess(reportService.processCardProgressSv(orderId, columns));
@@ -155,6 +156,15 @@
return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
}
+ @ApiOperation("璁㈠崟鎶ュ伐")
+ @SaCheckPermission("orderPlanDecomposition.search")
+ @PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
+ public Result orderReportingWorks(@PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
+ }
+
@ApiOperation("鍘熺墖棰嗘枡")
@SaCheckPermission("rawMaterialRequisition.search")
@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
--
Gitblit v1.8.0