From 6dbea727a1fcaa0de63578ac90183bfd0a1417b3 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期日, 27 四月 2025 09:51:48 +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/GlassOptimizeController.java |    6 ++++++
 1 files changed, 6 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 2119f78..226d24a 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
@@ -281,6 +281,12 @@
         return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
     }
 
+    @ApiOperation("妯℃嫙鎺掔増")
+    @PostMapping("/simulatedTypesetting")
+    public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
+        return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
+    }
+
 
 
 }

--
Gitblit v1.8.0