From 146d0b4e6d10f1692f8f22c843fa831394810364 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 10:19:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 8 +++++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 03e06ce..a4aaea2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -879,10 +879,10 @@
log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
} else {
if (waitWrkMast.getWrkSts() == 11) {
- if (waitWrkMast.getIoPri() + 100000D < 999999999D) {
- waitWrkMast.setIoPri(waitWrkMast.getIoPri()+100000D);
+ if (waitWrkMast.getIoPri() + 10D < 9999D) {
+ waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10D);
} else {
- waitWrkMast.setIoPri(999999999D);
+ waitWrkMast.setIoPri(9999D);
}
waitWrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(waitWrkMast) == 0) {
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 6ea0bca..f87315d 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -174,7 +174,7 @@
delRgvTask = false;
continue;
}
- Thread.sleep(200L);
+ Thread.sleep(50L);
// 鏋勫缓璁惧鐘舵�佸璞�
RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
@@ -209,6 +209,10 @@
}
OperateResult result0 = siemensNet.Write("DB100.0", (short) 1);
+
+ Thread.sleep(20L);
+
+ OperateResult result00 = siemensNet.Write("DB100.0", (short) 0);
}
} catch (Exception e) {
log.error("RGV鏁版嵁浠诲姟涓嬪彂澶嶄綅绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -310,6 +314,8 @@
continue;
}
+ Thread.sleep(50L);
+
RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
if (rgvProtocol == null || rgvTaskProtocol == null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3979c4e..9936e1b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -351,7 +351,7 @@
station.put(siteId, staProtocol);
}
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*slave.getId());
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*(slave.getId()-1));
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")){
--
Gitblit v1.9.1