From dcd2e9ad65580de56147956e718059f50f1691d2 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 30 一月 2026 08:36:12 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..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,13 +23,17 @@
private static final long serialVersionUID = 1L;
+ private Long id;
+
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
+
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ private String taskType;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -92,14 +97,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -243,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")
@@ -373,7 +383,17 @@
return null;
}
+ public String getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+
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)){
@@ -481,12 +501,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
- }
+// public void setErrorMemo(String errorMemo) {
+// if (errorMemo.length() > 255) {
+// errorMemo = errorMemo.substring(0, 150);
+// }
+// this.errorMemo = errorMemo;
+// }
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
--
Gitblit v1.9.1