From 7a806791fba46b27f4a8af6809c270f92be5f11c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 一月 2024 12:53:37 +0800
Subject: [PATCH] #堆垛机下发命令增加库位类型

---
 src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java |  170 ++++++++++----------------------------------------------
 1 files changed, 32 insertions(+), 138 deletions(-)

diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
index 8303186..4e9f53a 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -1,171 +1,65 @@
 package com.zy.asrs.domain.vo;
 
-import com.zy.asrs.domain.enums.CrnStatusType;
+import lombok.Data;
 
 /**
  * Created by vincent on 2020-06-02
  */
+@Data
 public class CrnStateTableVo {
 
     // 鍫嗗灈鏈哄彿
-    private String crnNo;
+    private Integer crnNo;
 
     // 妯″紡
-    private CrnStatusType type;
-
-    // 鎶ヨ
-    private String warn;
+    private String statusType = "-";
 
     // 鏈夌墿
-    private String loading;
+    private String loading = "-";
 
     // 鍒�
-    private String bay;
+    private Short bay;
 
     // 灞�
-    private String lev;
+    private Short lev;
+
+    // 璧拌鍘熺偣
+    private String xOrigin = "-";
+
+    // 鍗囬檷鍘熺偣
+    private String yOrigin = "-";
 
     // 璐у弶浣嶇疆
-    private String forkOffset;
+    private String forkOffset = "-";
+
+    // 杞借揣鍙颁綅缃�
+    private String liftPos = "-";
+
+    // 璧拌瀹氫綅
+    private String walkPos = "-";
+
+    // 鎬ュ仠
+    private String stop = "-";
 
     // 鍒楀潗鏍�
-    private String bayCoor;
+    private String bayCoor = "-";
 
     // 灞傚潗鏍�
-    private String levCoor;
+    private String levCoor = "-";
 
     // 瀹屾垚
-    private String complete;
+    private String complete = "-";
 
     // 浠诲姟鍙�
-    private String workNo;
+    private Short workNo = 0;
 
     // 鐘舵��
-    private String status;
+    private String status = "-";
 
-    // 鎶ヨ鐮�
-    private String warnCode;
+    // 寮傚父鐮�
+    private String warnCode = "-";
 
-    public CrnStateTableVo() {
-    }
+    // 鍨傜洿鏁呴殰鐮�
+    private String alarm = "-";
 
-    public CrnStateTableVo(String crnNo, CrnStatusType type, String warn, String loading, String bay, String lev, String forkOffset, String bayCoor, String levCoor, String complete, String workNo, String status, String warnCode) {
-        this.crnNo = crnNo;
-        this.type = type;
-        this.warn = warn;
-        this.loading = loading;
-        this.bay = bay;
-        this.lev = lev;
-        this.forkOffset = forkOffset;
-        this.bayCoor = bayCoor;
-        this.levCoor = levCoor;
-        this.complete = complete;
-        this.workNo = workNo;
-        this.status = status;
-        this.warnCode = warnCode;
-    }
-
-    public String getCrnNo() {
-        return crnNo;
-    }
-
-    public void setCrnNo(String crnNo) {
-        this.crnNo = crnNo;
-    }
-
-    public String getType() {
-        return type.getDesc();
-    }
-
-    public void setType(CrnStatusType type) {
-        this.type = type;
-    }
-
-    public String getWarn() {
-        return warn;
-    }
-
-    public void setWarn(String warn) {
-        this.warn = warn;
-    }
-
-    public String getLoading() {
-        return loading;
-    }
-
-    public void setLoading(String loading) {
-        this.loading = loading;
-    }
-
-    public String getBay() {
-        return bay;
-    }
-
-    public void setBay(String bay) {
-        this.bay = bay;
-    }
-
-    public String getLev() {
-        return lev;
-    }
-
-    public void setLev(String lev) {
-        this.lev = lev;
-    }
-
-    public String getForkOffset() {
-        return forkOffset;
-    }
-
-    public void setForkOffset(String forkOffset) {
-        this.forkOffset = forkOffset;
-    }
-
-    public String getBayCoor() {
-        return bayCoor;
-    }
-
-    public void setBayCoor(String bayCoor) {
-        this.bayCoor = bayCoor;
-    }
-
-    public String getLevCoor() {
-        return levCoor;
-    }
-
-    public void setLevCoor(String levCoor) {
-        this.levCoor = levCoor;
-    }
-
-    public String getComplete() {
-        return complete;
-    }
-
-    public void setComplete(String complete) {
-        this.complete = complete;
-    }
-
-    public String getWorkNo() {
-        return workNo;
-    }
-
-    public void setWorkNo(String workNo) {
-        this.workNo = workNo;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getWarnCode() {
-        return warnCode;
-    }
-
-    public void setWarnCode(String warnCode) {
-        this.warnCode = warnCode;
-    }
 }

--
Gitblit v1.9.1