From 123a17c9d50745ea609f91943adca64e5ed12355 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 12 四月 2025 09:08:14 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java |   94 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 78 insertions(+), 16 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..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 = "-";
@@ -31,6 +31,26 @@
      * 0涓虹┖
      */
     private Short currentCode;
+
+    /**
+     * 褰撳墠搴撲綅鍙�
+     */
+    private String locNo;
+
+    /**
+     * 搴撲綅鍙�-X
+     */
+    private int locNoX;
+
+    /**
+     * 搴撲綅鍙�-Y
+     */
+    private int locNoY;
+
+    /**
+     * 褰撳墠搴撲綅灞傞珮
+     */
+    private int locNoLev;
 
     /**
      * 鐢垫睜鐢甸噺
@@ -53,14 +73,29 @@
     private Short plcOutputStatusIO;
 
     /**
-     * 閿欒淇℃伅鐮�
+     * Plc杈撳嚭鐘舵�両O-椤跺崌浣�
      */
-    private Short statusErrorCode;
+    private Boolean plcOutputLift;
 
     /**
-     * 閿欒淇℃伅鐮佹灇涓�
+     * Plc杈撳嚭鐘舵�両O-鎹㈠悜浣�
      */
-    private ShuttleErrorCodeType errorCodeType;
+    private Boolean plcOutputTransfer;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-鎶遍椄浣�
+     */
+    private Boolean plcOutputBrake;
+
+    /**
+     * Plc杈撳嚭鐘舵�両O-鍏呯數浣�
+     */
+    private Boolean plcOutputCharge;
+
+    /**
+     * 閿欒淇℃伅鐮�
+     */
+    private String statusErrorCode;
 
     /**
      * PLC杈撳叆鐘舵��
@@ -85,7 +120,7 @@
     /**
      * 褰撳墠鐨勭數鍘嬪��
      */
-    private Short currentVoltage;
+    private Integer currentVoltage;
 
     /**
      * 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -122,19 +157,46 @@
      */
     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);
+    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$() {
+        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