From 0df6e7bb33c9f6a18f026a500776b00cbf2ae62c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 09:48:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasShuttle.java | 101 +++++++++++---------------------------------------
1 files changed, 22 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttle.java b/src/main/java/com/zy/asrs/entity/BasShuttle.java
index 999eb2b..ed0fd8f 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttle.java
@@ -9,12 +9,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -41,9 +35,9 @@
private Integer status;
/**
- * 浣滀笟鎬�
+ * 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
*/
- @ApiModelProperty(value= "浣滀笟鎬�")
+ @ApiModelProperty(value= "褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�")
@TableField("shuttle_status")
private Integer shuttleStatus;
@@ -53,45 +47,6 @@
@ApiModelProperty(value= "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
-
- /**
- * 鎺�
- */
- @ApiModelProperty(value= "鎺�")
- private Integer row;
-
- /**
- * 鍒�
- */
- @ApiModelProperty(value= "鍒�")
- private Integer bay;
-
- /**
- * 灞�
- */
- @ApiModelProperty(value= "灞�")
- private Integer lev;
-
- /**
- * 鍘嗗彶鎺�
- */
- @ApiModelProperty(value= "鍘嗗彶鎺�")
- @TableField("his_row")
- private Integer hisRow;
-
- /**
- * 鍘嗗彶鍒�
- */
- @ApiModelProperty(value= "鍘嗗彶鍒�")
- @TableField("his_bay")
- private Integer hisBay;
-
- /**
- * 鍘嗗彶灞�
- */
- @ApiModelProperty(value= "鍘嗗彶灞�")
- @TableField("his_lev")
- private Integer hisLev;
/**
* 鏆傚瓨搴撲綅
@@ -158,25 +113,33 @@
private Integer liftNo;
/**
- * 鏍囪
+ * 浣滀笟鏍囪
*/
- @ApiModelProperty(value= "鏍囪")
+ @ApiModelProperty(value= "浣滀笟鏍囪")
@TableField("pak_mk")
- private String pakMk;
+ private Boolean pakMk;
+
+ /**
+ * 灏忚溅杩愯閫熷害
+ */
+ @ApiModelProperty(value= "灏忚溅杩愯閫熷害")
+ @TableField("run_speed")
+ private Integer runSpeed;
+
+ /**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ @TableField("device_status")
+ private String deviceStatus;
public BasShuttle() {}
- public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,Integer row,Integer bay,Integer lev,Integer hisRow,Integer hisBay,Integer hisLev,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo) {
+ 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) {
this.shuttleNo = shuttleNo;
this.status = status;
this.shuttleStatus = shuttleStatus;
this.wrkNo = wrkNo;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
- this.hisRow = hisRow;
- this.hisBay = hisBay;
- this.hisLev = hisLev;
this.idleLoc = idleLoc;
this.autoCharge = autoCharge;
this.chargeLine = chargeLine;
@@ -186,29 +149,9 @@
this.updateTime = updateTime;
this.memo = memo;
this.liftNo = liftNo;
+ this.pakMk = pakMk;
+ this.deviceStatus = deviceStatus;
}
-
-// BasShuttle basShuttle = new BasShuttle(
-// null, // 鍥涘悜绌挎杞﹀彿[闈炵┖]
-// null, // 鐘舵��
-// null, // 浣滀笟鎬�
-// null, // 浠诲姟鍙�
-// null, // 鎺�
-// null, // 鍒�
-// null, // 灞�
-// null, // 鍘嗗彶鎺�
-// null, // 鍘嗗彶鍒�
-// null, // 鍘嗗彶灞�
-// null, // 鏆傚瓨搴撲綅
-// null, // 鑷姩鍏呯數
-// null, // 鐢甸噺绾�
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎻愬崌鏈哄彿
-// );
public String getStatus$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1