From cce8b8793ca1466ca1330f3bd62e11ae6551261e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 13:51:58 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/entity/CommandInfo.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index 94ca935..5bd8cd6 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.zy.core.enums.CommandType;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -13,41 +15,41 @@
 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;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableField("wrk_no")
+    @TableField("WRK_NO")
     private Integer wrkNo;
 
     /**
      * WMS浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    @TableField("task_no")
+    @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;
 
@@ -55,41 +57,42 @@
      * 鎸囦护绫诲瀷
      */
     @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")
+    @TableField("EXECUTE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date executeTime;
 
@@ -97,7 +100,7 @@
      * 瀹屾垚鏃堕棿
      */
     @ApiModelProperty(value= "瀹屾垚鏃堕棿")
-    @TableField("complete_time")
+    @TableField("COMPLETE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
@@ -181,5 +184,12 @@
         }
     }
 
+    public String getCommandType$() {
+        if (Cools.isEmpty(this.commandType)) {
+            return "";
+        }
+        return CommandType.get(this.commandType).desc;
+    }
+
 
 }

--
Gitblit v1.9.1