From 9e2e9f912340b806e32593689a408f477e0a1516 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 09:49:43 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 7d84ce8..575f680 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
@@ -35,7 +35,7 @@
* 鍥涘悜绌挎杞﹀彿
*/
@ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
- @TableId(value = "shuttle_no", type = IdType.AUTO)
+ @TableId(value = "shuttle_no", type = IdType.INPUT)
private Integer shuttleNo;
/**
@@ -54,7 +54,7 @@
* 浠诲姟鍙�
*/
@ApiModelProperty(value= "浠诲姟鍙�")
- private Integer wrkNo;
+ private Integer taskNo;
/**
* 鏆傚瓨搴撲綅
@@ -125,12 +125,19 @@
@ApiModelProperty(value= "鎵�灞炴満鏋�")
private Long hostId;
+ /**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ private String protocol;
+
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) {
+ 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.wrkNo = wrkNo;
+ this.taskNo = taskNo;
this.idleLoc = idleLoc;
this.autoCharge = autoCharge;
this.chargeLine = chargeLine;
@@ -142,9 +149,10 @@
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