From f417e368a7a68c693a30b16329fb3533a0c84183 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 30 一月 2024 18:27:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1865943..fd32e52 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -231,12 +231,12 @@
}
}
BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
- //RGV灏忚溅
- Thread.sleep(200);
+ //RGV灏忚溅1
+ Thread.sleep(100);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
if (result3.IsSuccess) {
BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
- if (!Cools.isEmpty(basRgvMap) && basRgvMap.getStartRoute() == 100){
+ if (!Cools.isEmpty(basRgvMap)){
Integer siteId = 1;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -248,12 +248,12 @@
staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
}
}
- //RGV灏忚溅
- Thread.sleep(200);
+ //RGV灏忚溅2
+ Thread.sleep(100);
OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
if (result4.IsSuccess) {
BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
- if (!Cools.isEmpty(basRgvMap) && (basRgvMap.getStartRoute() == 161 || basRgvMap.getStartRoute() == 157)){
+ if (!Cools.isEmpty(basRgvMap)){
Integer siteId = 2;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -266,6 +266,24 @@
}
}
+ //RGV灏忚溅3
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
+ if (result5.IsSuccess) {
+ BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
+ if (!Cools.isEmpty(basRgvMap)){
+ Integer siteId = 3;
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setAutoing(true);
+ staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8)));
+ }
+ }
+
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = BarcodeList;
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
--
Gitblit v1.9.1