From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/asrs/entity/BasShuttle.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index ed0fd8f..12dafc7 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -70,6 +70,13 @@
private Integer chargeLine;
/**
+ * 寤鸿鐢甸噺绾�
+ */
+ @ApiModelProperty(value= "寤鸿鐢甸噺绾�")
+ @TableField("suggest_charge_line")
+ private Integer suggestChargeLine;
+
+ /**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
@@ -106,13 +113,6 @@
private String memo;
/**
- * 鎻愬崌鏈哄彿
- */
- @ApiModelProperty(value= "鎻愬崌鏈哄彿")
- @TableField("lift_no")
- private Integer liftNo;
-
- /**
* 浣滀笟鏍囪
*/
@ApiModelProperty(value= "浣滀笟鏍囪")
@@ -133,9 +133,16 @@
@TableField("device_status")
private String deviceStatus;
+ /**
+ * 灏忚溅绂佺敤妤煎眰
+ */
+ @ApiModelProperty(value= "灏忚溅绂佺敤妤煎眰")
+ @TableField("disable_lev")
+ private String disableLev;
+
public BasShuttle() {}
- public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, String deviceStatus) {
+ public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Boolean pakMk, String deviceStatus) {
this.shuttleNo = shuttleNo;
this.status = status;
this.shuttleStatus = shuttleStatus;
@@ -148,7 +155,6 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
- this.liftNo = liftNo;
this.pakMk = pakMk;
this.deviceStatus = deviceStatus;
}
--
Gitblit v1.9.1