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 | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 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 f9db621..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
@@ -1,8 +1,9 @@
package com.example.erp.controller.pp;
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.OptimizeProjectMange;
+import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.GlassOptimizeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,6 +18,24 @@
public class GlassOptimizeController {
@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("鍒涘缓宸ョ▼鏌ヨ娴佺▼鍗℃帴鍙�")
@@ -43,4 +62,44 @@
@RequestBody OptimizeProjectMange optimizeProjectMange) {
return Result.seccess(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
}
+
+ //淇敼宸ョ▼鐘舵��
+ @ApiOperation("淇敼宸ョ▼鐘舵�佹帴鍙�")
+ @PostMapping("/updateProjectState/{projectNumber}/{state}")
+ public Result updateProjectState(
+ @PathVariable String projectNumber,
+ @PathVariable Integer state
+ ) {
+ if (glassOptimizeService.updateProjectState(projectNumber, state)) {
+ return Result.seccess();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
+
+ }
+ }
+
+ //鍒犻櫎宸ョ▼
+ @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));
+ }
+
}
--
Gitblit v1.8.0