From 947aa556843b17e1b5a003767a1cf6ae85ec39fe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 20 六月 2025 16:51:25 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 654042f..1dd59a3 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -284,11 +284,20 @@
         do {
             OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 4);
             if (resultRead.IsSuccess) {
-                short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
-                if(taskNo == 0) {
-                    result = siemensNet.Write("DB100.0", array);
+                if (command.getAckFinish() == 0) {
+                    short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
+                    if(taskNo == 0) {
+                        result = siemensNet.Write("DB100.0", array);
+                    }else {
+                        break;
+                    }
                 }else {
-                    break;
+                    short ackFinish = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+                    if(ackFinish != command.getAckFinish()) {
+                        result = siemensNet.Write("DB100.0", array);
+                    }else {
+                        break;
+                    }
                 }
             }
             idx++;
@@ -313,6 +322,7 @@
             } while (i < 5);
         }
 
+        this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
         try {
             // 鏃ュ織璁板綍
             BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
@@ -348,7 +358,6 @@
             return false;
         }
     }
-
 
     @Override
     public void close() {

--
Gitblit v1.9.1