From 3fd2ec65c4f8b2d0338f6e3f069b8d3c0ed2b197 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:22 +0800
Subject: [PATCH] #agv led显示信息修改
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..2ed4884 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
@@ -64,6 +65,20 @@
@ApiModelProperty(value= "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 绌挎杞�
+ */
+ @ApiModelProperty(value= "绌挎杞�")
+ @TableField(value = "shuttle_no",strategy = FieldStrategy.IGNORED)
+ private Integer shuttleNo;
+
+ /**
+ * 杈圭紭搴撲綅
+ */
+ @ApiModelProperty(value= "杈圭紭搴撲綅")
+ @TableField("out_most")
+ private Integer outMost;
@ApiModelProperty(value= "")
@TableField("sheet_no")
@@ -321,6 +336,13 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 鎻愬崌鏈哄彿
+ */
+ @ApiModelProperty(value= "鎻愬崌鏈哄彿")
+ @TableField("lift_no")
+ private Integer liftNo;
+
public WrkMast() {}
public String getYmd$(){
@@ -479,13 +501,6 @@
return "";
}
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 String getLogErrTime$(){
--
Gitblit v1.9.1