From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
index efbff09..89707ad 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -1,6 +1,7 @@
package com.zy.asrs.domain.vo;
import com.zy.asrs.utils.Utils;
+import com.zy.core.enums.CrnStatusType;
import lombok.Data;
@Data
@@ -52,7 +53,7 @@
private Short workNo = 0;
// 浠诲姟鐘舵��
- private String wrkStatus = "-";
+ private Integer wrkStatus;
// 寮傚父鐮�
private String warnCode = "-";
@@ -105,6 +106,12 @@
// 璁惧鐘舵��
private String deviceStatus = "-";
+ // 鍙叆
+ private String inEnable;
+
+ // 鍙嚭
+ private String outEnable;
+
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
}
@@ -133,4 +140,10 @@
this.yduration = Utils.scale(yduration);
}
+ public String getWrkStatus$() {
+ if (this.wrkStatus == null) {
+ return "-";
+ }
+ return CrnStatusType.get(this.wrkStatus.shortValue()).desc;
+ }
}
--
Gitblit v1.9.1