From 1983e747ee2368186cef348fd31e9e5163f56634 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 13:53:29 +0800
Subject: [PATCH] liftUpdate

---
 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 100 insertions(+), 14 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 c51d251..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 = "-";
@@ -33,6 +37,26 @@
     private Short currentCode;
 
     /**
+     * 褰撳墠搴撲綅鍙�
+     */
+    private String locNo;
+
+    /**
+     * 搴撲綅鍙�-X
+     */
+    private int locNoX;
+
+    /**
+     * 搴撲綅鍙�-Y
+     */
+    private int locNoY;
+
+    /**
+     * 褰撳墠搴撲綅灞傞珮
+     */
+    private int locNoLev;
+
+    /**
      * 鐢垫睜鐢甸噺
      */
     public String batteryPower = "-";
@@ -45,7 +69,7 @@
     /**
      * 閿欒缂栧彿
      */
-    private Short errorCode;
+    private String errorCode;
 
     /**
      * Plc杈撳嚭鐘舵�両O
@@ -53,14 +77,34 @@
     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;
 
     /**
      * 閿欒淇℃伅鐮佹灇涓�
      */
-    private ShuttleErrorCodeType statusErrorCodeType;
+    private ShuttleErrorCodeType errorCodeType;
 
     /**
      * PLC杈撳叆鐘舵��
@@ -85,7 +129,7 @@
     /**
      * 褰撳墠鐨勭數鍘嬪��
      */
-    private Short currentVoltage;
+    private Integer currentVoltage;
 
     /**
      * 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -122,19 +166,61 @@
      */
     public String loca = "-";
 
-    public String getStatusErrorCode$() {
-        if(this.statusErrorCodeType == null) return null;
-        return this.statusErrorCodeType.desc;
+    public String getErrorCode$() {
+        if(this.errorCodeType == null) return null;
+        return this.errorCodeType.desc;
     }
 
-    public void setStatusErrorCode(Short statusErrorCode) {
-        this.statusErrorCode = statusErrorCode;
-        this.statusErrorCodeType = 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();
-        this.statusErrorCodeType = type;
+    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";
+    }
+
+    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