From 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 10 十二月 2024 11:34:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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 7022879..9484a42 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
@@ -19,6 +19,24 @@
@Autowired
GlassOptimizeService glassOptimizeService;
+ //宸ョ▼淇℃伅
+ @ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
+ @PostMapping ("/projectInfo/{projectNo}")
+ public Result projectInfo(
+ @PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
+ }
+
+ //搴撳瓨淇℃伅
+ @ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
+ @PostMapping ("/materialStore/{thickness}/{model}")
+ public Result materialStore(
+ @PathVariable String thickness,
+ @PathVariable String model ){
+ return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model));
+ }
+
+
//宸ョ▼鏌ヨ娴佺▼鍗�
@ApiOperation("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃帴鍙�")
@PostMapping ("/getFlowCardList/{optionVal}/{radio}")
@@ -76,4 +94,12 @@
return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
}
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ @ApiOperation("妯℃嫙璁＄畻娴佺▼鍗¤鎯�")
+ @PostMapping ("/selectComputeDetail/{processId}")
+ public Result selectComputeDetail(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId));
+ }
+
}
--
Gitblit v1.8.0