From d8f676ad00f7053180bcbdb91b8abe511eae208e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 10 四月 2025 15:53:20 +0800
Subject: [PATCH] #motion == null时释放小车
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java | 51 +++++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 28 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 575f680..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
@@ -32,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.INPUT)
private Integer shuttleNo;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -55,12 +67,6 @@
*/
@ApiModelProperty(value= "浠诲姟鍙�")
private Integer taskNo;
-
- /**
- * 鏆傚瓨搴撲綅
- */
- @ApiModelProperty(value= "鏆傚瓨搴撲綅")
- private String idleLoc;
/**
* 鑷姩鍏呯數
@@ -113,7 +119,7 @@
private Integer runSpeed;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -131,28 +137,17 @@
@ApiModelProperty(value= "璁惧鐘舵��")
private String protocol;
+ /**
+ * 灏忚溅绂佺敤妤煎眰
+ */
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ private String disableLev;
+
public BasShuttle() {}
- public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer taskNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer runSpeed, Integer deleted, Long hostId, String protocol) {
- this.shuttleNo = shuttleNo;
- this.status = status;
- this.shuttleStatus = shuttleStatus;
- this.taskNo = taskNo;
- 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;
- this.protocol = protocol;
- }
- // BasShuttle basShuttle = new BasShuttle(
+
+// BasShuttle basShuttle = new BasShuttle(
// null, // 鐘舵��
// null, // 褰撳墠灏忚溅鐘舵��
// null, // 浠诲姟鍙�
--
Gitblit v1.9.1