From a2ae2b9f9b72388275a2cf083474d81696bc7206 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 24 十月 2024 10:57:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 69465cd..adb5ad2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -247,7 +247,7 @@
         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) {
@@ -306,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