From a925836fa0ec4d3e5362a289995c5cb3a3942ed7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 十二月 2024 11:30:43 +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 | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 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 d926a49..c8404cb 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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.Map;
@RestController
@Api(value="浼樺寲绠＄悊controller",tags={"浼樺寲绠＄悊鎿嶄綔鎺ュ彛"})
@@ -19,6 +20,32 @@
public class GlassOptimizeController {
@Autowired
GlassOptimizeService glassOptimizeService;
+
+ //宸ョ▼淇℃伅
+ @ApiOperation("宸ョ▼淇℃伅鎺ュ彛")
+ @PostMapping ("/projectInfo/{projectNo}")
+ public Result projectInfo(
+ @PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.projectInfoSv(projectNo));
+ }
+
+ //宸ョ▼淇℃伅娴佺▼鍗�
+ @ApiOperation("宸ョ▼淇℃伅娴佺▼鍗℃帴鍙�")
+ @PostMapping ("/getProcessCard/{projectNo}")
+ public Result getProcessCard(
+ @PathVariable String projectNo){
+ return Result.seccess(glassOptimizeService.getProcessCardSv(projectNo));
+ }
+
+ //搴撳瓨淇℃伅
+ @ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
+ @PostMapping ("/materialStore/{thickness}/{model}")
+ public Result materialStore(
+ @PathVariable String thickness,
+ @PathVariable String model ){
+ return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model));
+ }
+
//宸ョ▼鏌ヨ娴佺▼鍗�
@ApiOperation("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃帴鍙�")
@@ -61,4 +88,57 @@
}
}
+ //鍒犻櫎宸ョ▼
+ @ApiOperation("宸ョ▼绠＄悊鍒犻櫎鎺ュ彛")
+ @PostMapping("/deleteProject/{projectNumber}")
+ public Result deleteProject(
+ @PathVariable String projectNumber){
+ return Result.seccess(glassOptimizeService.deleteProject(projectNumber));
+ }
+
+ //妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�
+ @ApiOperation("妯℃嫙璁＄畻宸ョ▼鍙锋煡璇�")
+ @PostMapping ("/selectProjectCompute/{projectNumber}")
+ public Result selectProjectCompute(
+ @PathVariable String projectNumber){
+ return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
+ }
+
+ //妯℃嫙璁＄畻娴佺▼鍗¤鎯�
+ @ApiOperation("妯℃嫙璁＄畻娴佺▼鍗¤鎯�")
+ @PostMapping ("/selectComputeDetail/{processId}")
+ public Result selectComputeDetail(
+ @PathVariable String processId){
+ return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId));
+ }
+
+ //鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�
+ @ApiOperation("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃槑缁�")
+ @PostMapping ("/getProcessCardDetail/{processId}/{technologyNumber}")
+ public Result getProcessCardDetail(
+ @PathVariable String processId,
+ @PathVariable Integer technologyNumber){
+ return Result.seccess(glassOptimizeService.getProcessCardDetailSv(processId,technologyNumber));
+ }
+
+ @ApiOperation("鑶滅郴鏌ヨ")
+ @PostMapping ("/selectGlassType")
+ public Result selectGlassType(){
+ return Result.seccess(glassOptimizeService.selectGlassTypeSv());
+ }
+
+ @ApiOperation("鏈�鏂板伐绋嬪彿鏌ヨ")
+ @PostMapping ("/getProjectId")
+ public Result getProjectId(){
+ return Result.seccess(glassOptimizeService.getProjectIdSv());
+ }
+ @ApiOperation("鍒涘缓宸ョ▼鎺ュ彛")
+ @PostMapping("/addProject/{optionVal}/{projectId}/{projectNmae}")
+ public Result addProject(
+ @PathVariable String optionVal,
+ @PathVariable String projectId,
+ @PathVariable String projectNmae,
+ @RequestBody Map<String,Object> object){
+ return Result.seccess(glassOptimizeService.addProjectSv(optionVal,projectId,projectNmae,object));
+ }
}
--
Gitblit v1.8.0