From 00d9f3f5cf3b046cb42098c9bc13f2313a435f53 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 10:32:50 +0800
Subject: [PATCH] 提升机搬运前判断目标站是否可入
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 e667541..08bf110 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.core.enums.ShuttleErrorCodeType;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import lombok.Data;
@@ -14,7 +15,7 @@
private Integer shuttleNo;
// 鐘舵��
- private String status = "-";
+ private Integer status;
//鍥涘悜绌挎杞﹀繖瑁呭～
private String busyStatus = "-";
@@ -128,7 +129,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -208,4 +209,18 @@
return this.plcOutputCharge ? "Y" : "N";
}
+ public String getStatus$() {
+ if (this.status == null) {
+ return ShuttleProtocolStatusType.OFFLINE.desc;
+ }
+ return ShuttleProtocolStatusType.get(this.status).desc;
+ }
+
+ public String getCurrentVoltage$() {
+ if (this.currentVoltage == null) {
+ return "";
+ }
+ return (this.currentVoltage / 1000.0) + "V";
+ }
+
}
--
Gitblit v1.9.1