From 6c679ea7d1acdd67c7c2d4c7302b6420bd3fbcd5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 22 五月 2025 13:09:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 16 +++++++++++++++-
1 files changed, 15 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..bff0249 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,12 @@
// 璁惧鐘舵��
private String deviceStatus = "-";
+ // 鍙叆
+ private String inEnable;
+
+ // 鍙嚭
+ private String outEnable;
+
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
}
@@ -133,4 +141,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