From 8dc3bcb40363cc6f9281092b4f6ea0ebcb9335b0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 11:27:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread3.java | 6 +++---
src/main/java/com/zy/asrs/controller/AgvController.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvController.java b/src/main/java/com/zy/asrs/controller/AgvController.java
index 54a75e6..7e5bf48 100644
--- a/src/main/java/com/zy/asrs/controller/AgvController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvController.java
@@ -28,7 +28,7 @@
String slotCode = jsonObject.get("slotCode").toString();
Map<String,String> map = new HashMap<>();
- if(currentStationInfoMap.get(slotCode)){
+ if(!currentStationInfoMap.get(slotCode)){
map.put("allow","true");
}else {
map.put("allow","false");
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread3.java b/src/main/java/com/zy/core/thread/SiemensDevpThread3.java
index 9b460f4..75f1a17 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread3.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread3.java
@@ -41,8 +41,8 @@
private short heartBeatVal = 1;
private int barcodeSize = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(313);add(312);
- add(311);add(310);
+ add(316);add(314);
+ add(312);add(310);
}};
public SiemensDevpThread3(Devp2Slave slave) {
@@ -114,7 +114,7 @@
for (int i=0; i<staNos.size();i++){
String station = staNos.get(i) + "-1";
- currentStationInfoMap.put(station,booleans[0]);
+ currentStationInfoMap.put(station,booleans[i]);
// StaProtocol staProtocol = station.get(staNos.get(i));
--
Gitblit v1.9.1