From 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 09:46:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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..4debdf4 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
@@ -8,6 +9,7 @@
// 鍫嗗灈鏈哄彿
private Integer crnNo;
+ private Integer laneNo;
// 妯″紡
private String statusType = "-";
@@ -52,7 +54,7 @@
private Short workNo = 0;
// 浠诲姟鐘舵��
- private String wrkStatus = "-";
+ private Integer wrkStatus;
// 寮傚父鐮�
private String warnCode = "-";
@@ -105,6 +107,17 @@
// 璁惧鐘舵��
private String deviceStatus = "-";
+ // 鍙叆
+ private String inEnable;
+
+ // 鍙嚭
+ private String outEnable;
+ private String hpMk;
+ private String taskComplete = "鏃�";
+ private String errorCrn;
+ private String demo;
+ private Integer demoValue;
+
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
}
@@ -133,4 +146,25 @@
this.yduration = Utils.scale(yduration);
}
+ public String getWrkStatus$() {
+ if (this.wrkStatus == null) {
+ return "-";
+ }
+ return CrnStatusType.get(this.wrkStatus.shortValue()).desc;
+ }
+
+ public String getDemoValue$() {
+ switch (this.demoValue) {
+ case 0:
+ return "鍋滄";
+ case 1:
+ return "杩愯鍚姩涓�";
+ case 2:
+ return "杩愯涓�";
+ case 3:
+ return "鍋滄涓�";
+ default:
+ return "鏈煡鐘舵��";
+ }
+ }
}
--
Gitblit v1.9.1