From d8d90a246ce19dc9249ea7f0ffe1b8caf0462cc2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 31 八月 2024 12:47:22 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 2112efa..ec27ebb 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -65,6 +65,11 @@
public CrnStatusType statusType;
/**
+ * 鐘舵�佹灇涓�
+ */
+ public CrnStatusType statusTypeTwo;
+
+ /**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
public Short bay;
@@ -249,14 +254,24 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setStatus(Short status){
+ public void setStatus(Short status) {
this.status = status;
this.statusType = CrnStatusType.get(status);
}
- public void setStatus(CrnStatusType type){
+ public void setStatus(CrnStatusType type) {
this.statusType = type;
this.status = CrnStatusType.get(type).id.shortValue();
+ }
+
+ public void setStatusTwo(Short status) {
+ this.statusTwo = status;
+ this.statusTypeTwo = CrnStatusType.get(status);
+ }
+
+ public void setStatusTwo(CrnStatusType type) {
+ this.statusTypeTwo = type;
+ this.statusTwo = CrnStatusType.get(type).id.shortValue();
}
public Short getTemp1() {
@@ -269,14 +284,14 @@
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
- * I:鍏ュ簱
- * O:鍑哄簱
+ * I:鍏ュ簱
+ * O:鍑哄簱
*/
private String lastIo = "I";
- public BasCrnp toSqlModel(BasCrnp basCrnp){
- if (alarm!=null) {
+ public BasCrnp toSqlModel(BasCrnp basCrnp) {
+ if (alarm != null) {
basCrnp.setCrnErr(alarm.longValue());
}
basCrnp.setWrkNo(taskNo.intValue());
@@ -294,6 +309,7 @@
public void setzSpeed(Short zSpeed) {
this.zSpeed = Float.valueOf(zSpeed);
}
+
public void setzSpeedTwo(Short zSpeedTwo) {
this.zSpeedTwo = Float.valueOf(zSpeedTwo);
}
--
Gitblit v1.9.1