From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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 | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 1e5d4fa..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
@@ -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}")
@@ -111,7 +119,7 @@
@PathVariable Integer state,
@PathVariable Integer states,
@PathVariable Integer code
- ) {
+ ) throws JsonProcessingException {
if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
return Result.seccess();
} else {
@@ -166,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) {
@@ -246,12 +255,39 @@
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}")
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("鏇存柊浼樺寲缁撴灉鎺ュ彛")
@@ -366,7 +402,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