From a4259cfa901bb4cc79f6e091f941792c05310e85 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 13:55:19 +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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 6d839ca..d7eb966 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
@@ -85,12 +85,13 @@
//淇敼宸ョ▼鐘舵��
@ApiOperation("淇敼宸ョ▼鐘舵�佹帴鍙�")
- @PostMapping("/updateProjectState/{projectNumber}/{state}")
+ @PostMapping("/updateProjectState/{projectNumber}/{state}/{code}")
public Result updateProjectState(
@PathVariable String projectNumber,
- @PathVariable Integer state
+ @PathVariable Integer state,
+ @PathVariable Integer code
) {
- if (glassOptimizeService.updateProjectState(projectNumber, state)) {
+ if (glassOptimizeService.updateProjectState(projectNumber, state,code)) {
return Result.seccess();
} else {
throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
@@ -251,6 +252,11 @@
return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
}
+ @PostMapping("/getConfiguration/{type}")
+ public Result getConfiguration(@PathVariable String type) {
+ return Result.seccess(glassOptimizeService.getConfiguration(type));
+ }
+
--
Gitblit v1.8.0