From f27968397dd2d37add528bf7937ebd6905762a09 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 15:11:08 +0800
Subject: [PATCH] 穿梭车、提升机、主控界面优化

---
 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java |   85 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 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 abc0597..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;
@@ -33,6 +36,26 @@
     private Short currentCode;
 
     /**
+     * 褰撳墠搴撲綅鍙�
+     */
+    private String locNo;
+
+    /**
+     * 搴撲綅鍙�-X
+     */
+    private int locNoX;
+
+    /**
+     * 搴撲綅鍙�-Y
+     */
+    private int locNoY;
+
+    /**
+     * 褰撳墠搴撲綅灞傞珮
+     */
+    private int locNoLev;
+
+    /**
      * 鐢垫睜鐢甸噺
      */
     public String batteryPower = "-";
@@ -53,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;
 
     /**
      * 閿欒淇℃伅鐮佹灇涓�
@@ -85,7 +128,7 @@
     /**
      * 褰撳墠鐨勭數鍘嬪��
      */
-    private Short currentVoltage;
+    private Double currentVoltage;
 
     /**
      * 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -127,14 +170,42 @@
         return this.errorCodeType.desc;
     }
 
-    public void setStatusErrorCode(Short statusErrorCode) {
-        this.statusErrorCode = statusErrorCode;
-        this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode);
+    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