From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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 |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 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 046fd12..62c6dbb 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
@@ -33,10 +33,18 @@
     private UserService userService;
     //宸ョ▼淇℃伅
     @ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
-    @PostMapping  ("/projectInfo/{projectNo}")
+    @PostMapping  ("/projectInfo/{projectNo}/{username}")
     public Result projectInfo(
-            @PathVariable String projectNo){
-        return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
+            @PathVariable String projectNo,@PathVariable String username){
+        return Result.seccess(glassOptimizeService.projectInfoSv(projectNo,username));
+    }
+
+
+    // 浼樺寲淇℃伅浼犲叆
+    @ApiOperation("浼樺寲浼犲叆淇℃伅鎺ュ彛")
+    @PostMapping  ("/optimizeInfo/{projectNo}/{username}")
+    public Result optimizeInfo(@PathVariable String projectNo,@PathVariable String username){
+        return Result.seccess(glassOptimizeService.optimizeInfoSv(projectNo,username));
     }
 
     //宸ョ▼淇℃伅娴佺▼鍗�
@@ -53,8 +61,8 @@
     public Result materialStore(
             @PathVariable  String thickness,
             @PathVariable  String model,@PathVariable  String projectNumber,
-            @RequestParam(name = "type", required = false) Integer type ){
-        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type));
+            @RequestParam(name = "type", required = false) Integer type,@RequestParam(name = "username", required = false) String username  ){
+        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type,username));
     }
 
 
@@ -82,6 +90,16 @@
     public Result getProjectList(){
         return Result.seccess(glassOptimizeService.getProjectListSv());
     }
+
+    @ApiOperation("鏍规嵁宸ョ▼鍗″彿宸ョ▼鏌ヨ娴佺▼鍗�")
+    @PostMapping  ("/getProjectByProjectNo/{projectNo}")
+    public Result getProjectByProjectNo(
+            @PathVariable String projectNo
+    ){
+        return Result.seccess(glassOptimizeService.getProjectByProjectNoSv(projectNo));
+    }
+
+
 
     //宸ョ▼绠＄悊鏌ヨ
     @ApiOperation("宸ョ▼绠＄悊鏌ヨ鎺ュ彛")
@@ -156,6 +174,7 @@
     @ApiOperation("妯℃嫙璁＄畻淇濆瓨")
     @PostMapping("/simulationSave")
     public Result simulationSave(@RequestBody Map<String, Object> object) {
+        System.out.println("鎺ユ敹鍒扮殑妯℃嫙璁＄畻淇濆瓨鏁版嵁: " + object);
         try {
             return Result.seccess(glassOptimizeService.addSimulation(object));
         } catch (Exception e) {
@@ -244,6 +263,13 @@
         return  Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
     }
 
+    @ApiOperation("鏌ヨ浼樺寲缁撴灉淇℃伅鎺ュ彛")
+    @PostMapping("/getOptimizeInfo/{processId}")
+    public Result getOptimizeInfo(
+            @PathVariable String processId){
+        return  Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
+    }
+
     @ApiOperation("鏇存柊浼樺寲缁撴灉鎺ュ彛")
     @PostMapping("/updateOptimizeResult/{processId}")
     public Result updateOptimizeResult(
@@ -271,15 +297,15 @@
         return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
     }
 
-    @PostMapping("/getConfiguration/{type}")
-    public Result getConfiguration(@PathVariable String type) {
-        return Result.seccess(glassOptimizeService.getConfiguration(type));
+    @PostMapping("/getConfiguration/{type}/{username}")
+    public Result getConfiguration(@PathVariable String type,@PathVariable String username) {
+        return Result.seccess(glassOptimizeService.getConfiguration(type,username));
     }
 
     @ApiOperation("淇墖纾ㄩ噺淇敼")
-    @PostMapping("/saveConfiguration/{type}")
-    public Result saveConfiguration(@PathVariable String type, @RequestBody Map<String,Object>  object){
-        return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
+    @PostMapping("/saveConfiguration/{type}/{username}")
+    public Result saveConfiguration(@PathVariable String type,@PathVariable String username, @RequestBody Map<String,Object>  object){
+        return Result.seccess(glassOptimizeService.saveConfiguration(object,type,username));
     }
 
     @ApiOperation("妯℃嫙鎺掔増")
@@ -356,7 +382,11 @@
         return Result.seccess(glassOptimizeService.getProcessCardMpThirdParty(projectNo));
     }
 
-
+    @ApiOperation("mes宸ョ▼浠诲姟涓嬪彂鎺ュ彛")
+    @PostMapping("/getIssuingProjects")
+    public Result issuingProjects(@RequestBody String projectNo) throws JsonProcessingException {
+        return Result.seccess(glassOptimizeService.issuingProjects(projectNo));
+    }
 
 
 

--
Gitblit v1.8.0