From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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..3846f92 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,10 +32,16 @@
private static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
* 鍥涘悜绌挎杞﹀彿
*/
@ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
- @TableId(value = "shuttle_no", type = IdType.INPUT)
private Integer shuttleNo;
/**
@@ -133,26 +139,9 @@
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