From 56deaa56fc25a9546d730cc4590175ee0c22a6ff Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:23:29 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 1fb3f13..582c7b9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("asr_wrk_mast")
@@ -22,11 +23,12 @@
private static final long serialVersionUID = 1L;
+ private Long id;
+
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
@@ -246,9 +248,14 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣")
@TableField("pause_mk")
private String pauseMk;
+
+
+// @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
+// @TableField(exist = false)
+// private String avgSta;
@ApiModelProperty(value= "")
@TableField("error_time")
@@ -385,8 +392,8 @@
}
}
-
public String getStaNo$(){
+ if (Objects.isNull(this.staNo) || this.staNo.equals("null")) {return null; }
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
if (!Cools.isEmpty(basDevp)){
--
Gitblit v1.9.1