From b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:48 +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 | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 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 a37de06..3ab6258 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
@@ -24,6 +24,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.Date;
+import java.util.HashMap;
import java.util.Map;
@RestController
@@ -130,11 +131,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());
}
}
@@ -224,6 +228,31 @@
}
+ @PostMapping("/mesCalculate")
+ public ResponseEntity<Map<String, Object>> receiveOptimizeRequest(
+ @RequestBody Map<String, Object> requestData) {
+
+ Map<String, Object> response = new HashMap<>();
+
+ try {
+ // 绔嬪嵆杩斿洖鎺ユ敹鎴愬姛鐨勫搷搴�
+ response.put("code", "200");
+ response.put("msg", "success");
+ response.put("data", "");
+
+ // todo 寮傛澶勭悊璁＄畻浠诲姟
+// glassOptimizeService.processExternalOptimizeRequest(requestData);
+ System.out.println(requestData);
+
+ return ResponseEntity.ok(response);
+ } catch (Exception e) {
+ response.put("code", 201);
+ response.put("msg", "false: " + e.getMessage());
+ response.put("data", "");
+ return ResponseEntity.status(500).body(response);
+ }
+ }
+
--
Gitblit v1.8.0