From a08610b24b88e3e5cbf1e3e071d67c3818a440cf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 25 十二月 2024 13:18:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 285 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 151 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index ebe6d41..941ca06 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -1,13 +1,16 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,115 +23,93 @@
private static final long serialVersionUID = 1L;
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no1")
+ private Integer wrkNo1;
+
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.INPUT)
- private Long id;
+ @TableField("wrk_no2")
+ private Integer wrkNo2;
/**
- * RGV缂栧彿
+ * 绌挎杞�
*/
- @ApiModelProperty(value= "RGV缂栧彿")
+ @ApiModelProperty(value= "绌挎杞�")
@TableField("rgv_no")
private Integer rgvNo;
/**
- * 浠诲姟瀹屾垚纭浣�
+ * 涓嬪彂鏃堕棿
*/
- @ApiModelProperty(value= "浠诲姟瀹屾垚纭浣�")
- @TableField("ack_finish")
- private Integer ackFinish;
-
- /**
- * 宸ヤ綅1宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綅1宸ヤ綔鍙�")
- @TableField("task_no1")
- private Integer taskNo1;
-
- /**
- * 宸ヤ綅1妯″紡
- */
- @ApiModelProperty(value= "宸ヤ綅1妯″紡")
- @TableField("task_mode1")
- private Integer taskMode1;
-
- /**
- * 宸ヤ綅1婧愮珯
- */
- @ApiModelProperty(value= "宸ヤ綅1婧愮珯")
- @TableField("source_sta_no1")
- private Integer sourceStaNo1;
-
- /**
- * 宸ヤ綅1鐩爣绔�
- */
- @ApiModelProperty(value= "宸ヤ綅1鐩爣绔�")
- @TableField("destination_sta_no_1")
- private Integer destinationStaNo1;
-
- /**
- * 宸ヤ綅2宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綅2宸ヤ綔鍙�")
- @TableField("task_no2")
- private Integer taskNo2;
-
- /**
- * 宸ヤ綅2妯″紡
- */
- @ApiModelProperty(value= "宸ヤ綅2妯″紡")
- @TableField("task_mode2")
- private Integer taskMode2;
-
- /**
- * 宸ヤ綅2婧愮珯
- */
- @ApiModelProperty(value= "宸ヤ綅2婧愮珯")
- @TableField("source_sta_no2")
- private Integer sourceStaNo2;
-
- /**
- * 宸ヤ綅2鐩爣绔�
- */
- @ApiModelProperty(value= "宸ヤ綅2鐩爣绔�")
- @TableField("destination_sta_no2")
- private Integer destinationStaNo2;
-
- /**
- * 浠诲姟纭
- */
- @ApiModelProperty(value= "浠诲姟纭")
- private Integer command;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("create_time")
+ @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @TableField("send_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private Date sendTime;
/**
- * 鍒涘缓浜哄憳
+ * 浣滀笟
*/
- @ApiModelProperty(value= "鍒涘缓浜哄憳")
- @TableField("create_by")
- private Long createBy;
+ @ApiModelProperty(value= "浣滀笟")
+ private String mode;
/**
- * 鏇存柊鏃堕棿
+ * 婧愭帓
*/
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ @ApiModelProperty(value= "婧愭帓")
+ @TableField("source_row")
+ private Integer sourceRow;
/**
- * 鏇存柊浜哄憳
+ * 婧愬垪
*/
- @ApiModelProperty(value= "鏇存柊浜哄憳")
- @TableField("update_by")
- private Long updateBy;
+ @ApiModelProperty(value= "婧愬垪")
+ @TableField("source_bay")
+ private Integer sourceBay;
+
+ /**
+ * 婧愬眰
+ */
+ @ApiModelProperty(value= "婧愬眰")
+ @TableField("source_lev")
+ private Integer sourceLev;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta")
+ private Integer sourceSta;
+
+ /**
+ * 鐩爣鎺�
+ */
+ @ApiModelProperty(value= "鐩爣鎺�")
+ @TableField("pos_row")
+ private Integer posRow;
+
+ /**
+ * 鐩爣鍒�
+ */
+ @ApiModelProperty(value= "鐩爣鍒�")
+ @TableField("pos_bay")
+ private Integer posBay;
+
+ /**
+ * 鐩爣灞�
+ */
+ @ApiModelProperty(value= "鐩爣灞�")
+ @TableField("pos_lev")
+ private Integer posLev;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("pos_sta")
+ private Integer posSta;
/**
* 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
@@ -136,59 +117,79 @@
@ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
private Integer response;
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
public BasRgvOpt() {}
- public BasRgvOpt(Integer rgvNo,Integer ackFinish,Integer taskNo1,Integer taskMode1,Integer sourceStaNo1,Integer destinationStaNo1,Integer taskNo2,Integer taskMode2,Integer sourceStaNo2,Integer destinationStaNo2,Integer command,Date createTime,Long createBy,Date updateTime,Long updateBy,Integer response) {
+ public BasRgvOpt(Integer wrkNo1,Integer wrkNo2,Integer rgvNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) {
+ this.wrkNo1 = wrkNo1;
+ this.wrkNo2 = wrkNo2;
this.rgvNo = rgvNo;
- this.ackFinish = ackFinish;
- this.taskNo1 = taskNo1;
- this.taskMode1 = taskMode1;
- this.sourceStaNo1 = sourceStaNo1;
- this.destinationStaNo1 = destinationStaNo1;
- this.taskNo2 = taskNo2;
- this.taskMode2 = taskMode2;
- this.sourceStaNo2 = sourceStaNo2;
- this.destinationStaNo2 = destinationStaNo2;
- this.command = command;
- this.createTime = createTime;
- this.createBy = createBy;
+ this.sendTime = sendTime;
+ this.mode = mode;
+ this.sourceRow = sourceRow;
+ this.sourceBay = sourceBay;
+ this.sourceLev = sourceLev;
+ this.sourceSta = sourceSta;
+ this.posRow = posRow;
+ this.posBay = posBay;
+ this.posLev = posLev;
+ this.posSta = posSta;
+ this.response = response;
this.updateTime = updateTime;
this.updateBy = updateBy;
- this.response = response;
+ this.memo = memo;
}
// BasRgvOpt basRgvOpt = new BasRgvOpt(
-// null, // [闈炵┖]
-// null, // RGV缂栧彿
-// null, // 浠诲姟瀹屾垚纭浣�
-// null, // 宸ヤ綅1宸ヤ綔鍙�
-// null, // 宸ヤ綅1妯″紡
-// null, // 宸ヤ綅1婧愮珯
-// null, // 宸ヤ綅1鐩爣绔�
-// null, // 宸ヤ綅2宸ヤ綔鍙�
-// null, // 宸ヤ綅2妯″紡
-// null, // 宸ヤ綅2婧愮珯
-// null, // 宸ヤ綅2鐩爣绔�
-// null, // 浠诲姟纭
-// null, // 鍒涘缓鏃堕棿
-// null, // 鍒涘缓浜哄憳
-// null, // 鏇存柊鏃堕棿
-// null, // 鏇存柊浜哄憳
-// null // 鍝嶅簲缁撴灉
+// null, // 浠诲姟鍙�
+// null, //
+// null, // 绌挎杞�
+// null, // 涓嬪彂鏃堕棿
+// null, // 浣滀笟
+// null, // 婧愭帓
+// null, // 婧愬垪
+// null, // 婧愬眰
+// null, // 婧愮珯
+// null, // 鐩爣鎺�
+// null, // 鐩爣鍒�
+// null, // 鐩爣灞�
+// null, // 鐩爣绔�
+// null, // 鍝嶅簲缁撴灉
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 澶囨敞
+
// );
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
public String getResponse$(){
@@ -203,5 +204,21 @@
}
}
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1