From 7abf8942d941e0b50c29db7b9e7818b3333a7e87 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 06 十二月 2024 09:57:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 87c0781..baa789a 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,6 +54,8 @@
*/
public Short status;
+ public Short alarm = 0;
+
/**
* 鐘舵�佹灇涓�
*/
@@ -303,6 +305,9 @@
*/
public Float yDuration = 0F;
+ //鎸囦护ID
+ private Integer commandId;
+
public void setMode(Short mode) {
this.mode = mode;
this.modeType = CrnModeType.get(mode);
@@ -429,7 +434,7 @@
public BasCrnp toSqlModel(BasCrnp basCrnp){
- basCrnp.setCrnErr(alarm1.longValue());
+ basCrnp.setCrnErr(alarm.longValue());
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
}
--
Gitblit v1.9.1