From 27b048e77b68752c7c3060b9e31ad46efb4101a5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 08:07:03 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 9609a39..cd5153c 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
@@ -5,6 +5,10 @@
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.*;
+import com.zy.acs.conveyor.core.enums.DeviceField;
+import com.zy.acs.conveyor.core.enums.PlcAlarmDefinition;
+import com.zy.acs.conveyor.core.enums.SafeSignalField;
+import com.zy.acs.conveyor.core.enums.StationStatusField;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
@@ -169,7 +173,7 @@
staProtocol.setSegApply(status2[2]);
staProtocol.setApplyErr(status2[3]);
- if (!status2[1] && !status[0]) {
+ if (!status2[1] && !status[1]) {
staProtocol.setStartUpFlag(true);
}
@@ -204,9 +208,9 @@
content, seg[0] + i * DeviceField.BARCODE.getByteLength());
String barcode = siemensS7Net.getByteTransform().TransString(
content, seg[1] + i * DeviceField.BARCODE.getByteLength(),
- DeviceField.BARCODE.getByteLength()-seg[1] , "UTF-8").trim();
+ DeviceField.BARCODE.getByteLength() - seg[1], "UTF-8").trim();
- if (!Cools.isEmpty(barcode) && !barcode.contains("Default") && staNo != 0) {
+ if (!Cools.isEmpty(barcode) && !barcode.contains("Default") && !barcode.contains("Error") && staNo != 0) {
StaProtocol staProtocol = station.get(staNo);
if (staProtocol == null) {
log.warn("鎵爜绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
--
Gitblit v1.9.1