From 2442152cd669b31eb5b118e1fdf2bfd016656a5f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:05:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index 9eadf69..22524b2 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SnowflakeIdWorker;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -29,7 +31,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "task_no", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -89,7 +91,7 @@
/**
* 鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 3: 杞巻鍙�")
private Integer status;
/**
@@ -134,11 +136,20 @@
@TableField("devp_id")
private Integer devpId;
+ /**
+ * barcode
+ */
+ @ApiModelProperty(value= "barcode")
+ private String barcode;
+
@ApiModelProperty(value= "浠诲姟绫诲瀷")
@TableField("io_type")
- private Integer ioType;
+ private Integer ioType;//AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0 AGV搴撲綅==銆婣GV搴撲綅 1 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
- public BasAgvMast() {}
+ public BasAgvMast() {
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ this.timestamp = snowflakeIdWorker.nextId();
+ }
public BasAgvMast(Integer taskNo,Long timestamp,Integer sourceStaNo,Integer staNo,String sourceLocNo,String locNo,Long priority,Integer floorNo,Integer status,Date errorTime,String errorMemo,Date appeTime,Date modiTime,String modiUser) {
this.taskNo = taskNo;
@@ -183,6 +194,8 @@
return "浣滀笟涓�";
case 2:
return "瀹屾垚";
+ case 3:
+ return "杞巻鍙�";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1