From cdeb9e9559783cae56cbc6581b2e7aef893429b7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 27 三月 2023 17:02:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 125 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
index 8c5d06a..abc0597 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -1,5 +1,7 @@
package com.zy.asrs.domain.vo;
+import com.zy.core.enums.ShuttleErrorCodeType;
+import com.zy.core.enums.ShuttleStatusType;
import lombok.Data;
@Data
@@ -11,34 +13,24 @@
// 鐘舵��
private String status = "-";
- // 鏈夌墿
- private String loading = "-";
+ //鍥涘悜绌挎杞﹀繖瑁呭～
+ private String busyStatus = "-";
+
+ /**
+ * 灏忚溅蹇欑姸鎬佷綅鏋氫妇
+ */
+ private ShuttleStatusType busyStatusType;
/**
* 浠诲姟鍙�
*/
public Integer taskNo;
- // 姝ｅ湪鎵ц浠诲姟
- private String execute;
-
- // 浠诲姟瀹屾垚锛岀瓑寰匴CS纭
- private String waiting;
-
- // 鎺�
- private Short row;
-
- // 鍒�
- private Short bay;
-
- // 灞�
- private Short lev;
-
- // 寮傚父鐮�1
- private String alarm1 = "-";
-
- // 寮傚父鐮�2
- private String alarm2 = "-";
+ /**
+ * 褰撳墠浜岀淮鐮�
+ * 0涓虹┖
+ */
+ private Short currentCode;
/**
* 鐢垫睜鐢甸噺
@@ -46,9 +38,79 @@
public String batteryPower = "-";
/**
- * 褰撳墠閫熷害
+ * 鐢垫睜娓╁害
*/
- public Short speed;
+ public String batteryTemp = "-";
+
+ /**
+ * 閿欒缂栧彿
+ */
+ private String errorCode;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O
+ */
+ private Short plcOutputStatusIO;
+
+ /**
+ * 閿欒淇℃伅鐮�
+ */
+ private Short statusErrorCode;
+
+ /**
+ * 閿欒淇℃伅鐮佹灇涓�
+ */
+ private ShuttleErrorCodeType errorCodeType;
+
+ /**
+ * PLC杈撳叆鐘舵��
+ */
+ private Short plcInputStatus;
+
+ /**
+ * 褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸��
+ */
+ private Short currentOrBeforeCode;
+
+ /**
+ * 璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲�
+ */
+ private Short codeOffsetX;
+
+ /**
+ * 璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲�
+ */
+ private Short codeOffsetY;
+
+ /**
+ * 褰撳墠鐨勭數鍘嬪��
+ */
+ private Short currentVoltage;
+
+ /**
+ * 褰撳墠鐨勬ā鎷熼噺鍊�
+ */
+ private Short currentAnalogValue;
+
+ /**
+ * 褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
+ */
+ private Short currentLiftServoSpeed;
+
+ /**
+ * 褰撳墠鐨勮璧颁己鏈嶉�熷害
+ */
+ private Short currentMoveServoSpeed;
+
+ /**
+ * 褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
+ */
+ private Short currentLiftServoLoad;
+
+ /**
+ * 褰撳墠鐨勮璧颁己鏈嶈礋杞界巼
+ */
+ private Short currentMoveServoLoad;
/**
* 鍏呯數鐘舵��
@@ -60,4 +122,19 @@
*/
public String loca = "-";
+ public String getErrorCode$() {
+ if(this.errorCodeType == null) return null;
+ return this.errorCodeType.desc;
+ }
+
+ public void setStatusErrorCode(Short statusErrorCode) {
+ this.statusErrorCode = statusErrorCode;
+ this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode);
+ }
+
+ public void setStatusErrorCode(ShuttleErrorCodeType type) {
+ this.statusErrorCode = type.id.shortValue();
+ this.errorCodeType = type;
+ }
+
}
--
Gitblit v1.9.1