From 6ab3cda4f6baf9d49a85dd3a5c9e29365bcac87e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 15:26:39 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index fb24a86..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){
@@ -326,7 +327,7 @@
null, // 淇敼鏃堕棿
null // 淇敼浜哄憳
);
- bean.insert(basCrnOpt);
+ bean.save(basCrnOpt);
} catch (Exception ignore) {}
if (result != null && result.IsSuccess) {
@@ -473,4 +474,8 @@
}
+ @Override
+ public void setResetFlagTwo(boolean flag) {
+
+ }
}
--
Gitblit v1.9.1