From a94ec1f77595073621e46de6161397ed91e27d10 Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期四, 07 十一月 2024 16:46:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index c3d6eb5..d4b171d 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -157,8 +157,8 @@
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
- crnProtocol.setCrnNo(slave.getId());
}
+ crnProtocol.setCrnNo(slave.getId());
crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -247,12 +247,13 @@
do {
OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
if (resultAck.IsSuccess){
- Thread.sleep(100);
+ Thread.sleep(200);
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
if (ack != 0) {
writeAck++;
}else {
+ News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), "ack澶嶄綅瀹屾垚");
break;
}
}
@@ -305,12 +306,13 @@
one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
+ one.setCommand(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18));
one.setTraySize(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
|| !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
|| !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- || !command.getTraySize().equals(one.getTraySize())
+ || !command.getTraySize().equals(one.getTraySize()) || !command.getCommand().equals(one.getCommand())
|| !command.getAckFinish().equals(one.getAckFinish())
){
try{
--
Gitblit v1.9.1