From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
index 25e5472..ef124a3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -1,5 +1,6 @@
package com.zy.asrs.domain.vo;
+import com.zy.asrs.utils.Utils;
import lombok.Data;
/**
@@ -12,22 +13,22 @@
private Integer crnNo;
// 宸ヤ綔鍙�
- private Short workNo;
+ private Short workNo = 0;
// 鐘舵��
- private String status = "";
+ private String status = "-";
// 婧愮珯
- private String sourceStaNo = "";
+ private String sourceStaNo = "-";
// 鐩爣绔�
- private String staNo = "";
+ private String staNo = "-";
// 婧愬簱浣�
- private String sourceLocNo = "";
+ private String sourceLocNo = "-";
// 鐩爣搴撲綅
- private String locNo = "";
+ private String locNo = "-";
// 寮傚父
private String error = "";
@@ -38,4 +39,52 @@
// 鍛戒护
private String command = "";
+ // 璧拌閫熷害锛坢/min)
+ private Float xspeed = 0.0F;
+
+ // 鍗囬檷閫熷害锛坢/min)
+ private Float yspeed = 0.0F;
+
+ // 鍙夌墮閫熷害锛坢/min)
+ private Float zspeed = 0.0F;
+
+ // 璧拌璺濈(Km)
+ private Float xdistance = 0.0F;
+
+ // 鍗囬檷璺濈(Km)
+ private Float ydistance = 0.0F;
+
+ // 璧拌鏃堕暱(H)
+ private Float xduration = 0.0F;
+
+ // 鍗囬檷鏃堕暱(H)
+ private Float yduration = 0.0F;
+
+ public void setXspeed(Float xspeed) {
+ this.xspeed = Utils.scale(xspeed);
+ }
+
+ public void setYspeed(Float yspeed) {
+ this.yspeed = Utils.scale(yspeed);
+ }
+
+ public void setZspeed(Float zspeed) {
+ this.zspeed = Utils.scale(zspeed);
+ }
+
+ public void setXdistance(Float xdistance) {
+ this.xdistance = Utils.scale(xdistance);
+ }
+
+ public void setYdistance(Float ydistance) {
+ this.ydistance = Utils.scale(ydistance);
+ }
+
+ public void setXduration(Float xduration) {
+ this.xduration = Utils.scale(xduration);
+ }
+
+ public void setYduration(Float yduration) {
+ this.yduration = Utils.scale(yduration);
+ }
}
--
Gitblit v1.9.1