From 98895616ebf69fb398445dd0d664882349b0761f Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 11 四月 2026 18:05:23 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index a549e35..03e0b3d 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -134,7 +134,7 @@
return statusList;
}
- OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) (statusList.size() * 10));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB100.10", (short) (statusList.size() * 10));
if (result.IsSuccess) {
byte[] taskBufferRaw = readTaskBufferRaw();
for (int i = 0; i < statusList.size(); i++) {
@@ -215,31 +215,30 @@
boolean[] status1 = siemensNet.getByteTransform().TransBool(result4.Content, i * 2, 1);
boolean[] status2 = siemensNet.getByteTransform().TransBool(result4.Content, i * 2 + 1, 1);
- if(status1[0]){
+ if(status1[0] || status2[0]){
sb.append("宸﹁秴瀹芥姤璀�;");
}
- if(status1[1]) {
+ if(status1[1] || status2[1]) {
sb.append("鍙宠秴瀹芥姤璀�;");
}
- if(status1[2]) {
+ if(status1[2] || status2[2]) {
sb.append("鍓嶈秴闀挎姤璀�;");
}
- if(status1[3]) {
+ if(status1[3] || status2[3]) {
sb.append("鍚庤秴闀挎姤璀�;");
}
- if(status1[4]) {
+ if(status1[4] || status2[4]) {
sb.append("瓒呴珮鎶ヨ;");
}
- if(status1[5]) {
+ if(status1[5] || status2[5]) {
sb.append("鏈夎揣鎶ヨ锛岀┖鎵樺叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿;");
}
- if(status1[6]) {
+ if(status1[6] || status2[6]) {
sb.append("閲嶉噺寮傚父鎶ヨ;");
}
- if(status1[7]) {
+ if(status1[7] || status2[7]) {
sb.append("鎵爜寮傚父;");
}
-
applyAlarmMessage(barcodeEntity, sb.toString());
}
}
@@ -304,7 +303,7 @@
return commandResponse;
}
- int taskBaseOffset = stationIdx * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE);
+ int taskBaseOffset = (stationIdx + 1) * TASK_AREA_LENGTH + (useTaskWriteIdx * TASK_AREA_SLOT_SIZE);
OperateResult writeTaskNo = siemensNet.Write("DB13." + taskBaseOffset, command.getTaskNo());
if (!writeTaskNo.IsSuccess) {
@@ -347,7 +346,7 @@
return commandResponse;
}
- int slotBaseOffset = stationIdx * TASK_AREA_LENGTH + slotIdx * TASK_AREA_SLOT_SIZE;
+ int slotBaseOffset = (stationIdx + 1) * TASK_AREA_LENGTH + slotIdx * TASK_AREA_SLOT_SIZE;
CommandResponse clearTaskNo = sendOriginCommand("DB13." + slotBaseOffset, new short[]{0, 0});
if (clearTaskNo == null || !Boolean.TRUE.equals(clearTaskNo.getResult())) {
commandResponse.setMessage(clearTaskNo == null ? "娓呯┖浠诲姟鍙峰け璐�" : clearTaskNo.getMessage());
--
Gitblit v1.9.1