From c6621a215cc2e699c2d3b0e9c5bc2df5105907da Mon Sep 17 00:00:00 2001
From: ZY <zc>
Date: 星期五, 30 八月 2024 08:57:40 +0800
Subject: [PATCH] tisoshi

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e08db4f..5d532ca 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -298,10 +298,13 @@
         do {
             try{
                 if(!result.IsSuccess || !result2.IsSuccess){
-                    News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
+                    if (!resetFlag){
+                        News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
 //                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
-                    result = siemensNet.Write("DB100.0", array);
-                    result2 = siemensNet.Write("DB100.22", array2);
+                        result = siemensNet.Write("DB100.0", array);
+                        result2 = siemensNet.Write("DB100.22", array2);
+
+                    }
                     Thread.sleep(100);
                     writeCount1++;
                     continue;
@@ -339,15 +342,15 @@
                         }catch (Exception e){
 
                         }
-
-//                        News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
+                        if (!resetFlag){
+                            //                        News.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{},resetFlag={}", slave.getId(), JSON.toJSON(command),resetFlag);
 //                            MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
-                        News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
-                        result = siemensNet.Write("DB100.0", array);
-                        result2 = siemensNet.Write("DB100.22", array2);
+                            News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
+                            result = siemensNet.Write("DB100.0", array);
+                            result2 = siemensNet.Write("DB100.22", array2);
+                        }
                         writeCount1++;
                         continue;
-
                     } else {
                         News.info("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇绘垚鍔焄id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
                         break;

--
Gitblit v1.9.1