From 10ac21082bbbe92dabecdda1a98fe4539f746037 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 09:10:38 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 8c3e641..c591489 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -338,6 +338,7 @@
SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.buildAddress(),
(short) (staNoSize * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength()));
+
if (!result.IsSuccess) {
log.warn("璇诲彇PLC瀹夊叏浜や簰淇℃伅寮傚父 [id:{}]", slave.getId());
return;
@@ -372,11 +373,13 @@
staProtocolTake.setInComplete(status2[3]);
staProtocolTake.setOutComplete(status2[4]);
//
- if (status[3]){
- redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, new SafeSignal(i,(short)0,true));
+ if (status[3]) {
+ staProtocolPut.setSafeSignal( new SafeSignal(i, (short) 0, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocolPut);
}
- if (status2[4]){
- redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, new SafeSignal(i, (short) 0,false));
+ if (status2[4]) {
+ staProtocolTake.setSafeSignal(new SafeSignal(i, (short) 0, false));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);
}
--
Gitblit v1.9.1