From 7225bce9f6e79f4c6ac4ea592b644a6447f81c2e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 02 九月 2024 22:04:04 +0800
Subject: [PATCH] 对照协议调整

---
 src/main/java/com/zy/core/thread/MelsecCrnThread.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 0310a88..3a26c91 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -35,7 +35,8 @@
  */
 @Data
 @Slf4j
-public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
+public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread
+{
 
     private MelsecMcNet melsecMcNet;
     private CrnSlave slave;
@@ -193,7 +194,7 @@
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
                 // 澶嶄綅淇″彿
-                if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+                if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING_ONE)) {
                     News.error("MelsecCrn"+" - 3"+" ---------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
                     if (resetFlag) {
                         if(crnProtocol.getTaskNo()==9999){
@@ -473,4 +474,8 @@
 
     }
 
+    @Override
+    public void setResetFlagTwo(boolean flag) {
+
+    }
 }

--
Gitblit v1.9.1