From 31db311cbc564a85ed843913c32017c77705e148 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 十月 2023 10:43:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/skwcs' into tzskwcs
---
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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 e2cd14b..4e9f53a 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -12,13 +12,10 @@
private Integer crnNo;
// 妯″紡
- private String statusType;
-
- // 鎶ヨ
- private String warn;
+ private String statusType = "-";
// 鏈夌墿
- private String loading;
+ private String loading = "-";
// 鍒�
private Short bay;
@@ -26,29 +23,43 @@
// 灞�
private Short lev;
+ // 璧拌鍘熺偣
+ private String xOrigin = "-";
+
+ // 鍗囬檷鍘熺偣
+ private String yOrigin = "-";
+
// 璐у弶浣嶇疆
- private String forkOffset;
+ private String forkOffset = "-";
// 杞借揣鍙颁綅缃�
- private String liftPos;
+ 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 Short workNo;
+ private Short workNo = 0;
// 鐘舵��
- private String status;
+ private String status = "-";
// 寮傚父鐮�
- private String warnCode;
+ private String warnCode = "-";
+ // 鍨傜洿鏁呴殰鐮�
+ private String alarm = "-";
}
--
Gitblit v1.9.1