From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 e6f0a0e..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
@@ -39,6 +39,14 @@
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));
+ }
+
//宸ョ▼淇℃伅娴佺▼鍗�
@ApiOperation("宸ョ▼淇℃伅娴佺▼鍗℃帴鍙�")
@PostMapping ("/getProcessCard/{projectNo}")
@@ -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) {
@@ -242,6 +261,13 @@
public Result selectOptimizeResult(
@PathVariable String processId){
return Result.seccess(glassOptimizeService.selectOptimizeResult(processId));
+ }
+
+ @ApiOperation("鏌ヨ浼樺寲缁撴灉淇℃伅鎺ュ彛")
+ @PostMapping("/getOptimizeInfo/{processId}")
+ public Result getOptimizeInfo(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.getOptimizeInfoSv(processId));
}
@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