From 55a497c0c859009440d4edf79a9c5cac9db258f7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 31 三月 2025 15:27:08 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 289a2ec..37ca98b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -393,13 +393,13 @@
 //        array[10] = command.getDestinationStaNo();
         array[9] = command.getCommand();
         OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
-        Thread.sleep(200L);
+        Thread.sleep(100L);
         OperateResult result = siemensNet.Write("DB100.0", array);
 
         int i=0;
         do{
             //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
-            Thread.sleep(300);
+            Thread.sleep(100);
             OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
             if (resultRead.IsSuccess) {
                 CrnCommand one = new CrnCommand();
@@ -420,28 +420,32 @@
                     log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}]>>>>閲嶅啓[{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), i,JSON.toJSON(command),JSON.toJSON(one));
                     result = siemensNet.Write("DB100.0", array);
                 }else{
-                    short commandFinish = 1;
-                    Thread.sleep(100L);
-                    result = siemensNet.Write("DB100.18", commandFinish);
-                    int signFinish = 1;
-                    while (signFinish<5){
-                        OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
-                        short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
-                        if (transInt16 != commandFinish){
-                            log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "commandFinish:"+commandFinish);
-                            log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
-                            result = siemensNet.Write("DB100.18", commandFinish);
-                            signFinish++;
-                        }else {
-                            log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
-                            log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
-                            break;
-                        }
-                    }
                     break;
                 }
             }
         }while(i<5);
+
+        if (command.getAckFinish() == 0) {
+            short commandFinish = 1;
+            Thread.sleep(100L);
+            result = siemensNet.Write("DB100.18", commandFinish);
+            int signFinish = 1;
+            while (signFinish<5){
+                OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+                short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+                if (transInt16 != commandFinish){
+                    log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "commandFinish:"+commandFinish);
+                    log.info("涓嬪彂DB100.18  鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+                    result = siemensNet.Write("DB100.18", commandFinish);
+                    signFinish++;
+                }else {
+                    log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
+                    log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+                    break;
+                }
+            }
+        }
+
         try {
             // 鏃ュ織璁板綍
             BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);

--
Gitblit v1.9.1