From 5496a3a7b476135208d46dee279f506f9d69a234 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 08 一月 2026 10:54:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
index 8f0af83..4bc50fc 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java
@@ -50,7 +50,7 @@
@Override
public boolean connect() {
boolean connected = false;
- siemensNet = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
+ siemensNet = new SiemensS7Net(SiemensPLCS.S1500, deviceConfig.getIp());
OperateResult connect = siemensNet.ConnectServer();
if (connect.IsSuccess) {
connected = true;
@@ -66,6 +66,7 @@
News.error("杈撻�佺珯plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]",
deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort());
}
+// siemensNet.ConnectClose();
return connected;
}
@@ -97,6 +98,10 @@
if (barcodeStatusList != null) {
barcodeStatusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
}
+ }
+
+ if (siemensNet == null) {
+ return statusList;
}
OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) (statusList.size() * 8));
@@ -146,10 +151,12 @@
return commandResponse;
}
+ int maxTryCount = 999;
+ int tryCount = 0;
if (command.getCommandType().equals(StationCommandType.MOVE)) {
int enableCommandIdx = -1;
while (true) {
- enableCommandIdx = getEnableCommandIdx();
+ enableCommandIdx = getEnableCommandIdx(command.getTaskNo());
if(enableCommandIdx == -1) {
try {
Thread.sleep(300);
@@ -157,11 +164,16 @@
}else {
break;
}
+ tryCount++;
+ if (tryCount > maxTryCount) {
+ commandResponse.setMessage("鍛戒护涓嬪彂瓒呮椂锛屾棤娉曟壘鍒板彲鐢ㄤ笅鍙戝尯鍩�");
+ return commandResponse;
+ }
}
List<Integer> pathList = command.getNavigatePath();
- short[] data = new short[22];
+ short[] data = new short[21];
data[0] = command.getTargetStaNo().shortValue();
int dataIdx = 1;
@@ -169,9 +181,18 @@
data[dataIdx++] = path.shortValue();
}
- OperateResult writeTask = siemensNet.Write("DB23." + enableCommandIdx * taskAddressLength, command.getTaskNo());
- OperateResult writeData = siemensNet.Write("DB23." + enableCommandIdx * taskAddressLength + 4, data);
- if(writeTask.IsSuccess && writeData.IsSuccess) {
+ OperateResult writeTask = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength), command.getTaskNo());
+ try {
+ Thread.sleep(50);
+ }catch (Exception e) {}
+
+ OperateResult writeData = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength + 4), data);
+ try {
+ Thread.sleep(200);
+ }catch (Exception e) {}
+ OperateResult writeConfirm = siemensNet.Write("DB23." + (enableCommandIdx * taskAddressLength + 46), (short) 1);
+
+ if(writeTask.IsSuccess && writeData.IsSuccess && writeConfirm.IsSuccess) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆備换鍔″彿={}锛岀珯鐐规暟鎹�={}", command.getTaskNo(), JSON.toJSON(command));
commandResponse.setResult(true);
}else {
@@ -219,11 +240,21 @@
return null;
}
- private int getEnableCommandIdx() {
+ private int getEnableCommandIdx(int taskNo) {
int useIdx = -1;
for (int i = 0; i < taskAddressLimit; i++) {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB23." + i * taskAddressLength, (short) taskAddressLength);
- int taskStatus = siemensNet.getByteTransform().TransInt16(result.Content, i * taskAddressLength + 46);
+ OperateResultExOne<byte[]> resultTask = siemensNet.Read("DB23." + (i * taskAddressLength + 0), (short) 2);
+ OperateResultExOne<byte[]> resultStatus = siemensNet.Read("DB23." + (i * taskAddressLength + 46), (short) 2);
+ if(resultTask.IsSuccess && resultStatus.IsSuccess) {
+ continue;
+ }
+
+ int commandAreaTaskNo = siemensNet.getByteTransform().TransInt32(resultTask.Content, 0);
+ if(commandAreaTaskNo == taskNo) {
+ return -1;
+ }
+
+ int taskStatus = siemensNet.getByteTransform().TransInt16(resultStatus.Content, 0);
if (taskStatus == 1) {
continue;
}
--
Gitblit v1.9.1