From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 45bb793..8d68b74 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
@@ -58,6 +58,13 @@
return Result.success(glassOptimizeService.getProcessCardSv(projectNo));
}
+ @ApiOperation("宸ョ▼淇℃伅鏌ヨ鎺ュ彛")
+ @PostMapping ("/getProjectState/{projectNo}")
+ public Result getProjectState(
+ @PathVariable String projectNo){
+ return Result.success(glassOptimizeService.getProjectState(projectNo));
+ }
+
//搴撳瓨淇℃伅
@ApiOperation("搴撳瓨淇℃伅鎺ュ彛")
@GetMapping ("/materialStore/{thickness}/{model}/{projectNumber}")
@@ -123,11 +130,14 @@
@PathVariable Integer states,
@PathVariable Integer code
) throws JsonProcessingException {
- if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
- return Result.success();
- } else {
- throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
-
+ try {
+ if (glassOptimizeService.updateProjectState(projectNumber, state, states, code)) {
+ return Result.success();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
+ }
+ } catch (Exception e) {
+ return Result.error("201", e.getMessage());
}
}
@@ -484,6 +494,13 @@
}
+ @ApiOperation("mes宸ョ▼鐢熶骇涓嶅彲瑙佹帴鍙�")
+ @PostMapping("/issuingCancelProject")
+ public Result issuingCancelProject(@RequestBody String projectNo){
+ return Result.success(glassOptimizeService.issuingCancelProject(projectNo));
+ }
+
+
}
--
Gitblit v1.8.0