From 08782f91c979be03a8b911fcc0d4d73ec3329488 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 25 二月 2026 14:20:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 3fca44d..bc0200c 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -177,6 +177,7 @@
HashMap<Integer, List<StationObjModel>> inStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
Integer lev = entry.getKey();
@@ -267,6 +268,13 @@
runBlockReassignStationList.add(stationObjModel);
runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
}
+
+ Integer isOutOrder = value.getInteger("isOutOrder");
+ if (isOutOrder != null && isOutOrder == 1) {
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ isOutOrderStationList.add(stationObjModel);
+ isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
+ }
} else if (nodeType.equals("rgv")) {
//RGV
nodeData.put("type", "rgv");
@@ -316,6 +324,7 @@
List<StationObjModel> inStationList = inStationMap.get(deviceNo);
List<StationObjModel> outStationList = outStationMap.get(deviceNo);
List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);
if (barcodeStationList != null) {
basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -333,6 +342,10 @@
basDevp.setRunBlockReassignLocStationList(JSON.toJSONString(runBlockReassignStationList, SerializerFeature.DisableCircularReferenceDetect));
}
+ if (isOutOrderStationList != null) {
+ basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
basDevp.setUpdateTime(new Date());
basDevpService.insertOrUpdate(basDevp);
--
Gitblit v1.9.1