From faf2c5e81aedcac5ea83b797e89302938b399829 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 19:19:51 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 14cba8a..873297c 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
@@ -3,10 +3,9 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.acs.common.utils.News;
-import com.zy.acs.conveyor.core.constant.DeviceField;
-import com.zy.acs.conveyor.core.constant.PlcAlarmDefinition;
-import com.zy.acs.conveyor.core.constant.SafeSignalField;
-import com.zy.acs.conveyor.core.constant.StationStatusField;
+import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.conveyor.core.constant.*;
+import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.service.DevpS7Service;
@@ -37,6 +36,9 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station;
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
private static final int WRITE_RETRY_MAX = 5;
@@ -167,6 +169,15 @@
staProtocol.setSegApply(status2[2]);
staProtocol.setApplyErr(status2[3]);
+ if (!status2[1] && !status[1]) {
+ staProtocol.setStartUpFlag(true);
+ }
+
+ for (int i = 0; i < 8; i++) {
+ if (status0[i + 8] != status2[i]) {
+ log.info("鐘舵�佺爜涓嶄竴鑷� [id:{}] [i:{}] [status0:{}] [status2:{}]", slave.getId(), i, status0[i], status2[i]);
+ }
+ }
}
/**
@@ -193,16 +204,16 @@
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");
+ DeviceField.BARCODE.getByteLength()-seg[1] , "UTF-8").trim();
- if (!Cools.isEmpty(barcode) && 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);
continue;
}
staProtocol.setBarcode(barcode);
- News.info("鏂欑鐮侊細{}", barcode);
+ //News.info("鏂欑鐮侊細{}", barcode);
}
}
}
@@ -233,7 +244,7 @@
if (!Cools.isEmpty(weight) && staNo != 0) {
StaProtocol staProtocol = station.get(staNo);
if (staProtocol == null) {
- log.warn("绉伴噸绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
+ log.warn(" [id:{}] [staNo:{}]", slave.getId(), staNo);
continue;
}
staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
@@ -336,6 +347,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;
@@ -369,6 +381,18 @@
staProtocolTake.setAllowPut(status2[2]);
staProtocolTake.setInComplete(status2[3]);
staProtocolTake.setOutComplete(status2[4]);
+ //
+ if (status[3]) {
+ staProtocolPut.setSafeSignal(new SafeSignal(i, false, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolPut);
+ News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
+ }
+ if (status2[4]) {
+ staProtocolTake.setSafeSignal(new SafeSignal(i, false, false));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);
+ News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
+ }
+
}
}
--
Gitblit v1.9.1