From b22b5b594c4cc9321f1b0ab6814a6290f1bfa7b2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/CommandInfo.java | 87 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 39 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..e49b7bc 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;
@@ -28,18 +25,18 @@
private Integer id;
/**
- * 浠诲姟鍙穡cs_command_info
+ * 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @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:瀹屾垚}
@@ -55,14 +52,6 @@
@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;
/**
* 鎸囦护绫诲瀷
@@ -98,32 +87,38 @@
@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 +127,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 +150,8 @@
}
Date endDate = new Date();
- if (!Cools.isEmpty(this.endTime)) {
- endDate = this.endTime;
+ if (!Cools.isEmpty(this.completeTime)) {
+ endDate = this.completeTime;
}
//鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
@@ -181,5 +183,12 @@
}
}
+ public String getCommandType$() {
+ if (Cools.isEmpty(this.commandType)) {
+ return "";
+ }
+ return CommandType.get(this.commandType).desc;
+ }
+
}
--
Gitblit v1.9.1