From 1e2964ae445ddf166b01d3ea37b5888ec75705d8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 30 九月 2023 09:23:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 8 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..08bf110 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,10 @@
 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.ShuttleProtocolStatusType;
 import com.zy.core.enums.ShuttleStatusType;
 import lombok.Data;
 
@@ -11,7 +15,7 @@
     private Integer shuttleNo;
 
     // 鐘舵��
-    private String status = "-";
+    private Integer status;
 
     //鍥涘悜绌挎杞﹀繖瑁呭～
     private String busyStatus = "-";
@@ -95,7 +99,7 @@
     /**
      * 閿欒淇℃伅鐮�
      */
-    private Short statusErrorCode;
+    private String statusErrorCode;
 
     /**
      * 閿欒淇℃伅鐮佹灇涓�
@@ -125,7 +129,7 @@
     /**
      * 褰撳墠鐨勭數鍘嬪��
      */
-    private Short currentVoltage;
+    private Integer currentVoltage;
 
     /**
      * 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -167,14 +171,35 @@
         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$() {
@@ -184,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