From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java |    9 +++++++++
 1 files changed, 9 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 6059b9d..8e655a8 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
@@ -155,6 +155,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