From 73af02320e1d3c43fbc12d06f1935569ae49e155 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 12 十月 2025 18:58:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index 3f0d53e..bdee6f6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -255,6 +255,26 @@
         return  Result.seccess(glassOptimizeService.saveOptimizeResult(object,projectId));
     }
 
+    @ApiOperation("鏌ヨ鎶ュ憡鏁版嵁鎺ュ彛")
+    @PostMapping("/getReportData/{processId}")
+    public Result getReportData(@PathVariable String processId){
+        return  Result.seccess(glassOptimizeService.getReportDataSv(processId));
+    }
+
+    @ApiOperation("鏌ヨ鐗╂枡淇℃伅鎺ュ彛")
+    @PostMapping("/materialInfo/{processId}")
+    public Result materialInfo(
+            @PathVariable String processId){
+        return  Result.seccess(glassOptimizeService.getMaterialInfoSv(processId));
+    }
+
+
+    @ApiOperation("鏌ヨ浜у搧鍒楄〃鎺ュ彛")
+    @PostMapping("/getProductList/{processId}")
+    public Result getProductList(
+            @PathVariable String processId){
+        return  Result.seccess(glassOptimizeService.getProductListSv(processId));
+    }
 
     @ApiOperation("鏌ヨ浼樺寲缁撴灉鎺ュ彛")
     @PostMapping("/selectOptimizeResult/{processId}")

--
Gitblit v1.8.0