From ce641926a957d238b202aa0d9dac3b8f15aff153 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 14 五月 2025 14:43:00 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 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 0736d69..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;
@@ -194,6 +199,10 @@
* Z琛岃蛋绾块�熷害m/min
*/
private Float zSpeed;
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeedTwo;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
@@ -245,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() {
@@ -265,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());
@@ -291,6 +310,10 @@
this.zSpeed = Float.valueOf(zSpeed);
}
+ public void setzSpeedTwo(Short zSpeedTwo) {
+ this.zSpeedTwo = Float.valueOf(zSpeedTwo);
+ }
+
public void setxDistance(Short xDistance) {
this.xDistance = Float.valueOf(xDistance);
}
--
Gitblit v1.9.1