From b6defdc0caf971dcaef9b6245801c6522a31c8a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 09 八月 2023 12:47:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/CommandInfo.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 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..52f670c 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -4,13 +4,8 @@
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 org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,18 +23,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:瀹屾垚}
@@ -100,9 +95,10 @@
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, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc, String command) {
+ this.id = id;
this.wrkNo = wrkNo;
- this.wmsWrkNo = wmsWrkNo;
+ this.taskNo = taskNo;
this.commandStatus = commandStatus;
this.startTime = startTime;
this.endTime = endTime;
@@ -110,20 +106,8 @@
this.device = device;
this.deviceLog = deviceLog;
this.commandDesc = commandDesc;
+ this.command = command;
}
-
-// CommandInfo commandInfo = new CommandInfo(
-// null, // 浠诲姟鍙�
-// null, // 璧风偣浣嶇疆
-// null, // 缁堢偣浣嶇疆
-// null, // 鎸囦护鐘舵��
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 鎸囦护绫诲瀷
-// null, // 璁惧
-// null, // 璁惧鎵ц淇℃伅
-// null // 鍛戒护鎻忚堪
-// );
public String getStartTime$(){
if (Cools.isEmpty(this.startTime)){
--
Gitblit v1.9.1