From 6d99081f3f6e0363b0bd28053e545a8e4589b979 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 09 一月 2026 08:50:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index b261f07..4a2a97e 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -198,6 +198,9 @@
}else if (nodeType.equals("RGB(255,192,0)")) {
//鍫嗗灈鏈�
nodeData.put("type", "crn");
+ }else if (nodeType.equals("RGB(255,255,0)")) {
+ //鍙屽伐浣嶅爢鍨涙満
+ nodeData.put("type", "dualCrn");
}else if (nodeType.equals("RGB(0,112,192)")) {
//杈撻�佺嚎
nodeData.put("type", "devp");
@@ -215,8 +218,21 @@
Integer isBarcodeStation = value.getInteger("isBarcodeStation");
if (isBarcodeStation != null && isBarcodeStation == 1) {
+ StationObjModel barcodeStationModel = new StationObjModel();
+ barcodeStationModel.setDeviceNo(deviceNo);
+ barcodeStationModel.setStationId(value.getInteger("stationId"));
+ barcodeStationModel.setBarcodeIdx(value.getInteger("barcodeIdx"));
+
+ if (value.getInteger("backStation") != null) {
+ StationObjModel backStation = new StationObjModel();
+ barcodeStationModel.setBackStation(backStation);
+
+ backStation.setDeviceNo(value.getInteger("backStationDeviceNo"));
+ backStation.setStationId(value.getInteger("backStation"));
+ }
+
List<StationObjModel> barcodeStationList = barcodeStationMap.getOrDefault(deviceNo, new ArrayList<>());
- barcodeStationList.add(stationObjModel);
+ barcodeStationList.add(barcodeStationModel);
barcodeStationMap.put(deviceNo, barcodeStationList);
}
--
Gitblit v1.9.1