From fdbbac3e711e6be54513cca6fa4ec3a17d293f49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 14:13:59 +0800
Subject: [PATCH] 四向穿梭车充电逻辑
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 38c4aae..99302f5 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,8 @@
package com.zy.asrs.domain.vo;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasShuttleErr;
+import com.zy.asrs.service.BasShuttleErrService;
import com.zy.core.enums.ShuttleErrorCodeType;
import com.zy.core.enums.ShuttleStatusType;
import lombok.Data;
@@ -73,9 +76,29 @@
private Short plcOutputStatusIO;
/**
+ * Plc杈撳嚭鐘舵�両O-椤跺崌浣�
+ */
+ private Boolean plcOutputLift;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鎹㈠悜浣�
+ */
+ private Boolean plcOutputTransfer;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鎶遍椄浣�
+ */
+ private Boolean plcOutputBrake;
+
+ /**
+ * Plc杈撳嚭鐘舵�両O-鍏呯數浣�
+ */
+ private Boolean plcOutputCharge;
+
+ /**
* 閿欒淇℃伅鐮�
*/
- private Short statusErrorCode;
+ private String statusErrorCode;
/**
* 閿欒淇℃伅鐮佹灇涓�
@@ -105,7 +128,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Double currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -147,14 +170,42 @@
return this.errorCodeType.desc;
}
- public void setStatusErrorCode(Short statusErrorCode) {
- this.statusErrorCode = statusErrorCode;
- this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode.intValue());
+ public void setErrorCode(Short errorCode) {
+ this.errorCode = ShuttleErrorCodeType.get(errorCode.intValue()).desc;
+ this.errorCodeType = ShuttleErrorCodeType.get(errorCode.intValue());
}
- public void setStatusErrorCode(ShuttleErrorCodeType type) {
- this.statusErrorCode = type.id.shortValue();
+ public void setErrorCode(ShuttleErrorCodeType type) {
+ this.errorCode = type.desc;
this.errorCodeType = type;
}
+ public String getPlcOutputLift$() {
+ if (this.plcOutputLift == null) {
+ return null;
+ }
+ return this.plcOutputLift ? "Y" : "N";
+ }
+
+ public String getPlcOutputTransfer$() {
+ if (this.plcOutputTransfer == null) {
+ return null;
+ }
+ return this.plcOutputTransfer ? "Y" : "N";
+ }
+
+ public String getPlcOutputBrake$() {
+ if (this.plcOutputBrake == null) {
+ return null;
+ }
+ return this.plcOutputBrake ? "Y" : "N";
+ }
+
+ public String getPlcOutputCharge$() {
+ if (this.plcOutputCharge == null) {
+ return null;
+ }
+ return this.plcOutputCharge ? "Y" : "N";
+ }
+
}
--
Gitblit v1.9.1