From d275de3d0c74be202870e90c75fe5a641f8f22c8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 四月 2025 16:24:54 +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 | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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..b970adf 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
@@ -49,11 +49,11 @@
//搴撳瓨淇℃伅
@ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
- @PostMapping ("/materialStore/{thickness}/{model}")
+ @PostMapping ("/materialStore/{thickness}/{model}/{projectNumber}")
public Result materialStore(
@PathVariable String thickness,
- @PathVariable String model ){
- return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model));
+ @PathVariable String model,@PathVariable String projectNumber ){
+ return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber));
}
@@ -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,16 @@
return new ResponseEntity<>(optContent.getBytes(), headers, HttpStatus.OK);
}
+ @PostMapping("/getConfiguration/{type}")
+ public Result getConfiguration(@PathVariable String type) {
+ return Result.seccess(glassOptimizeService.getConfiguration(type));
+ }
+
+ @ApiOperation("淇墖纾ㄩ噺淇敼")
+ @PostMapping("/saveConfiguration/{type}")
+ public Result saveConfiguration(@PathVariable String type, @RequestBody Map<String,Object> object){
+ return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
+ }
--
Gitblit v1.8.0