From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 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 eaef679..1d11cd8 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -1,6 +1,6 @@
package com.zy.asrs.domain.vo;
-import com.zy.core.enums.ShuttleErrorCodeType;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import lombok.Data;
@@ -11,7 +11,7 @@
private Integer shuttleNo;
// 鐘舵��
- private String status = "-";
+ private Integer status;
//鍥涘悜绌挎杞﹀繖瑁呭～
private String busyStatus = "-";
@@ -95,12 +95,7 @@
/**
* 閿欒淇℃伅鐮�
*/
- private Short statusErrorCode;
-
- /**
- * 閿欒淇℃伅鐮佹灇涓�
- */
- private ShuttleErrorCodeType errorCodeType;
+ private String statusErrorCode;
/**
* PLC杈撳叆鐘舵��
@@ -125,7 +120,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Short currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -162,19 +157,25 @@
*/
public String loca = "-";
- public String getErrorCode$() {
- if(this.errorCodeType == null) return null;
- return this.errorCodeType.desc;
+ public String getPlcOutputLift$() {
+ if (this.plcOutputLift == null) {
+ return null;
+ }
+ return this.plcOutputLift ? "Y" : "N";
}
- public void setStatusErrorCode(Short statusErrorCode) {
- this.statusErrorCode = statusErrorCode;
- this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode.intValue());
+ public String getPlcOutputTransfer$() {
+ if (this.plcOutputTransfer == null) {
+ return null;
+ }
+ return this.plcOutputTransfer ? "Y" : "N";
}
- public void setStatusErrorCode(ShuttleErrorCodeType type) {
- this.statusErrorCode = type.id.shortValue();
- this.errorCodeType = type;
+ public String getPlcOutputBrake$() {
+ if (this.plcOutputBrake == null) {
+ return null;
+ }
+ return this.plcOutputBrake ? "Y" : "N";
}
public String getPlcOutputCharge$() {
@@ -184,4 +185,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