From f97c8c0c36f81028de156c861b73d73428a1f415 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 15:14:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 8a199cc..3fca44d 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -192,17 +192,18 @@
HashMap<String, Object> nodeData = new HashMap<>();
nodeData.put("value", map.get("value"));
- String nodeType = map.get("bgColor").toString();
- if (nodeType.equals("RGB(0,176,80)")) {
+ String bgColor = map.get("bgColor").toString();
+ String nodeType = map.get("nodeType").toString();
+ if (nodeType.equals("shelf")) {
//璐ф灦
nodeData.put("type", "shelf");
- } else if (nodeType.equals("RGB(255,192,0)")) {
+ } else if (nodeType.equals("crn")) {
//鍫嗗灈鏈�
nodeData.put("type", "crn");
- } else if (nodeType.equals("RGB(255,255,0)")) {
+ } else if (nodeType.equals("dualCrn")) {
//鍙屽伐浣嶅爢鍨涙満
nodeData.put("type", "dualCrn");
- } else if (nodeType.equals("RGB(0,112,192)")) {
+ } else if (nodeType.equals("devp")) {
//杈撻�佺嚎
nodeData.put("type", "devp");
@@ -266,7 +267,7 @@
runBlockReassignStationList.add(stationObjModel);
runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
}
- } else if (nodeType.equals("RGB(0,176,240)")) {
+ } else if (nodeType.equals("rgv")) {
//RGV
nodeData.put("type", "rgv");
} else if (nodeType.equals("none")) {
@@ -275,6 +276,7 @@
} else if (nodeType.equals("merge")) {
//鍚堝苟鍖哄煙
nodeData.put("type", "merge");
+ nodeData.put("mergeType", map.get("mergeType"));
}
nodeData.put("cellWidth", map.get("cellWidth"));
--
Gitblit v1.9.1