From 3a3ec51d536a37713d8270ec797c451e347fed5e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 06 七月 2023 11:15:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java |  145 +++++++++++++++++-------------------------------
 1 files changed, 51 insertions(+), 94 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 35e96c8..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,133 +1,90 @@
 package com.zy.asrs.domain.vo;
 
+import com.zy.asrs.utils.Utils;
+import lombok.Data;
+
 /**
  * Created by vincent on 2020-06-02
  */
+@Data
 public class CrnMsgTableVo {
 
     // 鍫嗗灈鏈哄彿
-    private String crnNo;
-
-    // 鐘舵��
-    private String status;
+    private Integer crnNo;
 
     // 宸ヤ綔鍙�
-    private String workNo;
+    private Short workNo = 0;
+
+    // 鐘舵��
+    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;
+    private String error = "";
 
     // 鍘熺偣
-    private String origin;
+    private String origin = "";
 
     // 鍛戒护
-    private String command;
+    private String command = "";
 
-    public CrnMsgTableVo() {
+    // 璧拌閫熷害锛坢/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 CrnMsgTableVo(String crnNo, String status, String workNo, String sourceStaNo, String staNo, String sourceLocNo, String locNo, String error, String origin, String command) {
-        this.crnNo = crnNo;
-        this.status = status;
-        this.workNo = workNo;
-        this.sourceStaNo = sourceStaNo;
-        this.staNo = staNo;
-        this.sourceLocNo = sourceLocNo;
-        this.locNo = locNo;
-        this.error = error;
-        this.origin = origin;
-        this.command = command;
+    public void setYspeed(Float yspeed) {
+        this.yspeed = Utils.scale(yspeed);
     }
 
-    public String getCrnNo() {
-        return crnNo;
+    public void setZspeed(Float zspeed) {
+        this.zspeed = Utils.scale(zspeed);
     }
 
-    public void setCrnNo(String crnNo) {
-        this.crnNo = crnNo;
+    public void setXdistance(Float xdistance) {
+        this.xdistance = Utils.scale(xdistance);
     }
 
-    public String getStatus() {
-        return status;
+    public void setYdistance(Float ydistance) {
+        this.ydistance = Utils.scale(ydistance);
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setXduration(Float xduration) {
+        this.xduration = Utils.scale(xduration);
     }
 
-    public String getWorkNo() {
-        return workNo;
-    }
-
-    public void setWorkNo(String workNo) {
-        this.workNo = workNo;
-    }
-
-    public String getSourceStaNo() {
-        return sourceStaNo;
-    }
-
-    public void setSourceStaNo(String sourceStaNo) {
-        this.sourceStaNo = sourceStaNo;
-    }
-
-    public String getStaNo() {
-        return staNo;
-    }
-
-    public void setStaNo(String staNo) {
-        this.staNo = staNo;
-    }
-
-    public String getSourceLocNo() {
-        return sourceLocNo;
-    }
-
-    public void setSourceLocNo(String sourceLocNo) {
-        this.sourceLocNo = sourceLocNo;
-    }
-
-    public String getLocNo() {
-        return locNo;
-    }
-
-    public void setLocNo(String locNo) {
-        this.locNo = locNo;
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
+    public void setYduration(Float yduration) {
+        this.yduration = Utils.scale(yduration);
     }
 }

--
Gitblit v1.9.1