From 0fc62ab3d5d038235b328d91cda0192a34617fb9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 19 五月 2025 20:17:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
index 8592a9c..c885f1a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
@@ -2,6 +2,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -29,14 +32,26 @@
private static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 璁惧ID
+ */
+ @ApiModelProperty(value= "璁惧ID")
+ private Integer deviceId;
+
+ /**
* 鍥涘悜绌挎杞﹀彿
*/
@ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
- @TableId(value = "shuttle_no", type = IdType.AUTO)
private Integer shuttleNo;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -51,13 +66,7 @@
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- private Integer wrkNo;
-
- /**
- * 鏆傚瓨搴撲綅
- */
- @ApiModelProperty(value= "鏆傚瓨搴撲綅")
- private String idleLoc;
+ private Integer taskNo;
/**
* 鑷姩鍏呯數
@@ -110,7 +119,7 @@
private Integer runSpeed;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -122,24 +131,21 @@
@ApiModelProperty(value= "鎵�灞炴満鏋�")
private Long hostId;
+ /**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ private String protocol;
+
+ /**
+ * 灏忚溅绂佺敤妤煎眰
+ */
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ private String disableLev;
+
public BasShuttle() {}
- public BasShuttle(Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer runSpeed,Integer deleted,Long hostId) {
- this.status = status;
- this.shuttleStatus = shuttleStatus;
- this.wrkNo = wrkNo;
- this.idleLoc = idleLoc;
- this.autoCharge = autoCharge;
- this.chargeLine = chargeLine;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.runSpeed = runSpeed;
- this.deleted = deleted;
- this.hostId = hostId;
- }
+
// BasShuttle basShuttle = new BasShuttle(
// null, // 鐘舵��
--
Gitblit v1.9.1