From b99858aa6d24d6e5f0c300701bcf3f5fa8f05a23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 29 十二月 2021 16:22:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 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 0c2c5d8..b8f744d 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -12,10 +12,10 @@
     private Integer crnNo;
 
     // 妯″紡
-    private String statusType;
+    private String statusType = "-";
 
     // 鏈夌墿
-    private String loading;
+    private String loading = "-";
 
     // 鍒�
     private Short bay;
@@ -24,42 +24,60 @@
     private Short lev;
 
     // 璧拌鍘熺偣
-    private String xOrigin;
+    private String xOrigin = "-";
 
     // 鍗囬檷鍘熺偣
-    private String yOrigin;
+    private String yOrigin = "-";
+
+    // 浼镐綅楂樹綆
+    private String liftPos = "-";
+
+    // 绔欏彴楂樹綆
+    private String sitePos = "-";
 
     // 璧拌瀹氫綅
-    private String xLocation;
+    private String xLocation = "-";
 
     // 鍗囬檷瀹氫綅
-    private String yLocation;
+    private String yLocation = "-";
 
     // 璐у弶浣嶇疆
-    private String forkOffset;
+    private String forkOffset = "-";
 
-    // 杞借揣鍙颁綅缃�
-    private String liftPos;
+//    // 杞借揣鍙颁綅缃�
+//    private String liftPos = "-";
 
     // 鎬ュ仠
-    private String stop;
+    private String stop = "-";
 
     // 鍒楀潗鏍�
-    private String bayCoor;
+    private String bayCoor = "-";
 
     // 灞傚潗鏍�
-    private String levCoor;
+    private String levCoor = "-";
 
     // 瀹屾垚
-    private String complete;
+    private String complete = "-";
 
     // 浠诲姟鍙�
-    private Short workNo;
+    private Short workNo = 0;
 
     // 鐘舵��
-    private String status;
+    private String status = "-";
 
     // 寮傚父鐮�
-    private String warnCode;
+    private String warnCode = "-";
+
+    // 鍨傜洿鏁呴殰鐮�
+    private String alarm1 = "-";
+
+    // 姘村钩鏁呴殰鐮�
+    private String alarm2 = "-";
+
+    // 鍙夌墮鏁呴殰鐮�
+    private String alarm3 = "-";
+
+    // 鐘舵�佹晠闅滅爜
+    private String alarm4 = "-";
 
 }

--
Gitblit v1.9.1