From ccd6309576bfa66ddf40b8a48202ced37c05333a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 四月 2025 14:32:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/CommandInfo.java | 106 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index a29eba9..5bd8cd6 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -4,13 +4,10 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.Calendar;
import java.util.Date;
+
+import com.zy.core.enums.CommandType;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,112 +15,111 @@
import java.io.Serializable;
@Data
-@TableName("wcs_command_info")
+@TableName("\"SOURCE\".\"wcs_command_info\"")
public class CommandInfo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
- * 浠诲姟鍙穡cs_command_info
+ * 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
- @TableField("wrk_no")
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @TableField("WRK_NO")
private Integer wrkNo;
/**
* WMS浠诲姟鍙�
*/
- @ApiModelProperty(value= "WMS浠诲姟鍙�")
- @TableField("wms_wrk_no")
- private Integer wmsWrkNo;
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("TASK_NO")
+ private String taskNo;
/**
* 鎸囦护绫诲瀷{1:鍒涘缓,2:鎵ц,3:瀹屾垚}
*/
@ApiModelProperty(value= "鎸囦护鐘舵��")
- @TableField("command_status")
+ @TableField("COMMAND_STATUS")
private Integer commandStatus;
/**
* 寮�濮嬫椂闂�
*/
@ApiModelProperty(value= "寮�濮嬫椂闂�")
- @TableField("start_time")
+ @TableField("START_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
/**
* 鎸囦护绫诲瀷
*/
@ApiModelProperty(value= "鎸囦护绫诲瀷")
- @TableField("command_type")
+ @TableField("COMMAND_TYPE")
private Integer commandType;
/**
* 璁惧
*/
@ApiModelProperty(value= "璁惧")
+ @TableField("DEVICE")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
@ApiModelProperty(value= "璁惧鎵ц淇℃伅")
- @TableField("device_log")
+ @TableField("DEVICE_LOG")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
@ApiModelProperty(value= "鍛戒护鎻忚堪")
- @TableField("command_desc")
+ @TableField("COMMAND_DESC")
private String commandDesc;
/**
* 鍛戒护JSON
*/
@ApiModelProperty(value= "鍛戒护JSON")
- @TableField("command")
+ @TableField("COMMAND")
private String command;
+
+ /**
+ * 鎵ц鏃堕棿
+ */
+ @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @TableField("EXECUTE_TIME")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date executeTime;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @TableField("COMPLETE_TIME")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date completeTime;
public CommandInfo() {}
- public CommandInfo(Integer wrkNo, Integer wmsWrkNo, Integer commandStatus, Date startTime, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc) {
+ public CommandInfo(Integer id, Integer wrkNo, String taskNo, Integer commandStatus, Date startTime, Integer commandType, String device, String deviceLog, String commandDesc, String command, Date executeTime, Date completeTime) {
+ this.id = id;
this.wrkNo = wrkNo;
- this.wmsWrkNo = wmsWrkNo;
+ this.taskNo = taskNo;
this.commandStatus = commandStatus;
this.startTime = startTime;
- this.endTime = endTime;
this.commandType = commandType;
this.device = device;
this.deviceLog = deviceLog;
this.commandDesc = commandDesc;
+ this.command = command;
+ this.executeTime = executeTime;
+ this.completeTime = completeTime;
}
-
-// CommandInfo commandInfo = new CommandInfo(
-// null, // 浠诲姟鍙�
-// null, // 璧风偣浣嶇疆
-// null, // 缁堢偣浣嶇疆
-// null, // 鎸囦护鐘舵��
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 鎸囦护绫诲瀷
-// null, // 璁惧
-// null, // 璁惧鎵ц淇℃伅
-// null // 鍛戒护鎻忚堪
-// );
public String getStartTime$(){
if (Cools.isEmpty(this.startTime)){
@@ -132,11 +128,18 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getExecuteTime$(){
+ if (Cools.isEmpty(this.executeTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+ }
+
+ public String getCompleteTime$(){
+ if (Cools.isEmpty(this.completeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
}
/**
@@ -148,8 +151,8 @@
}
Date endDate = new Date();
- if (!Cools.isEmpty(this.endTime)) {
- endDate = this.endTime;
+ if (!Cools.isEmpty(this.completeTime)) {
+ endDate = this.completeTime;
}
//鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
@@ -181,5 +184,12 @@
}
}
+ public String getCommandType$() {
+ if (Cools.isEmpty(this.commandType)) {
+ return "";
+ }
+ return CommandType.get(this.commandType).desc;
+ }
+
}
--
Gitblit v1.9.1