From 1b007b8d43f82cf86e3cf5f2a316f30bae51deb2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 12:53:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java b/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
index 9d6ecb5..36a6e91 100644
--- a/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java
@@ -25,7 +25,7 @@
private Integer liftNo;
/**
- * 妯″紡0鍗曟満 1鑱旀満
+ * 妯″紡0鎵嬪姩 1鍗曟満 2鑱旀満
*/
private Integer model;
@@ -52,7 +52,7 @@
/**
* 浠诲姟妯″紡
*/
- private Integer mode = ForkLiftTaskModeType.NONE.id;
+ private Integer taskMode = ForkLiftTaskModeType.NONE.id;
/**
* 浠诲姟妯″紡鏋氫妇
@@ -83,6 +83,11 @@
* 鏁呴殰鐮�
*/
private Integer errorCode;
+
+ /**
+ * 褰撳墠灞�
+ */
+ private Integer lev;
/**
* 浣滀笟鏍囪
@@ -123,17 +128,17 @@
/**
* 璁剧疆浠诲姟妯″紡
*/
- public void setMode(Integer mode) {
- this.mode = mode;
- this.modeType = ForkLiftTaskModeType.get(mode);
+ public void setTaskMode(Integer taskMode) {
+ this.taskMode = taskMode;
+ this.modeType = ForkLiftTaskModeType.get(taskMode);
}
/**
* 璁剧疆浠诲姟妯″紡
*/
- public void setMode(ForkLiftTaskModeType mode) {
- this.mode = mode.id;
- this.modeType = mode;
+ public void setMode(ForkLiftTaskModeType taskMode) {
+ this.taskMode = taskMode.id;
+ this.modeType = taskMode;
}
/**
@@ -186,6 +191,46 @@
}
}
+ public String getModel$() {
+ if (this.model == null) {
+ return "";
+ }
+
+ String name = "";
+ if (this.model == 0) {
+ name = "鎵嬪姩";
+ } else if (this.model == 1) {
+ name = "鍗曟満";
+ }else if (this.model == 2) {
+ name = "鑱旀満";
+ }
+ return name;
+ }
+
+ public String getProtocolStatus$() {
+ if (this.protocolStatus == null) {
+ return "";
+ }
+
+ return ForkLiftProtocolStatusType.get(this.protocolStatus).desc;
+ }
+
+ public String getTaskMode$() {
+ if (this.taskMode == null) {
+ return "";
+ }
+
+ return ForkLiftTaskModeType.get(this.taskMode).desc;
+ }
+
+ public String getIOMode$() {
+ if (this.iOMode == null) {
+ return "";
+ }
+
+ return ForkLiftIoModeType.get(this.iOMode).desc;
+ }
+
@Override
public ForkLiftProtocol clone() {
try {
--
Gitblit v1.9.1