From 22d9b27f913cc47d54b361870f62aa81b4c8fd85 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 5c1d5d7..0a29623 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,6 +1,8 @@
package com.zy.core.model.protocol;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
+import com.zy.core.model.command.ShuttleAssignCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -19,22 +21,32 @@
/**
* 浠诲姟鍙�
*/
- public Short taskNo = 0;
+ private Short taskNo = 0;
/**
- * 鎺�
+ * 浠诲姟鎸囦护
*/
- public Short row;
+ private ShuttleAssignCommand assignCommand;
/**
- * 鍒�
+ * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
*/
- public Short bay;
+ private Integer protocolStatus;
/**
- * 灞�
+ * 褰撳墠灏忚溅鐘舵�佹灇涓�
*/
- public Short lev;
+ private ShuttleProtocolStatusType protocolStatusType;
+
+ /**
+ * 婧愬簱浣�
+ */
+ private String sourceLocNo;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ private String locNo;
/**
* 灏忚溅蹇欑姸鎬佷綅
@@ -132,7 +144,7 @@
/**
* 浣滀笟鏍囪
*/
- private String pakMk = "-";
+ private Boolean pakMk = true;
// 浠诲姟淇℃伅 ---------------------------------------------------------
/**
@@ -220,4 +232,25 @@
this.busyStatusType = type;
}
+ //鑾峰彇鐢垫睜鐢甸噺
+ public Short getBatteryPower() {
+ return (short) (this.batteryPower * 0.1);
+ }
+
+ /**
+ * 璁剧疆灏忚溅鐘舵��
+ */
+ public void setProtocolStatus(Integer status) {
+ this.protocolStatus = status;
+ this.protocolStatusType = ShuttleProtocolStatusType.get(status);
+ }
+
+ /**
+ * 璁剧疆灏忚溅鐘舵��
+ */
+ public void setProtocolStatus(ShuttleProtocolStatusType status) {
+ this.protocolStatus = status.id;
+ this.protocolStatusType = status;
+ }
+
}
--
Gitblit v1.9.1