From d97742662f28a693e325ce163c5ebf57802efb63 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 05 十二月 2025 12:56:41 +0800
Subject: [PATCH] #读超长条码BUG修复
---
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index a31a216..79f38cd 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -5,6 +5,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SnowflakeIdWorker;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -29,7 +33,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "task_no", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -43,7 +47,14 @@
* RGV浠诲姟鍙�
*/
@ApiModelProperty(value= "RGV浠诲姟鍙�")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long timestamp;
+ @TableField(exist = false)
+ private String timestampStr;
+
+ public String getTimestampStr() {
+ return timestamp == null ? "" : timestamp.toString();
+ }
/**
* 婧愮珯鐐�
@@ -134,11 +145,28 @@
@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();
+ this.barcode = String.valueOf(snowflakeIdWorker.nextId());
+
+ this.priority = 1L;
+ this.status = 0;
+
+ Date now = new Date();
+ this.appeTime = now;
+ this.modiTime = now;
+ }
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;
--
Gitblit v1.9.1