From ca9d1359afeb60ca2dc7215b17535c4bd5e6f274 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:19:16 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java |  122 +++++-----------------------------------
 1 files changed, 17 insertions(+), 105 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 7c84e2a..9a49997 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -18,202 +18,106 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
     @ApiModelProperty(value= "ID")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 缂栧彿
-     */
     @ApiModelProperty(value= "缂栧彿")
     private String uuid;
 
-    /**
-     * 鎬荤嚎
-     */
     @ApiModelProperty(value= "鎬荤嚎")
     private Long busId;
 
-    /**
-     * 浠诲姟鍙�
-     */
     @ApiModelProperty(value= "浠诲姟鍙�")
     private String seqNum;
 
-    /**
-     * 浼樺厛绾�
-     */
     @ApiModelProperty(value= "浼樺厛绾�")
     private Integer priority;
 
-    /**
-     * 鍚嶇О
-     */
     @ApiModelProperty(value= "鍚嶇О")
     private String name;
 
-    /**
-     * 浠诲姟杩涘害
-     */
     @ApiModelProperty(value= "浠诲姟杩涘害")
     private Long taskSts;
 
-    /**
-     * 浠诲姟绫诲瀷
-     */
     @ApiModelProperty(value= "浠诲姟绫诲瀷")
     private Long taskType;
 
-    /**
-     * AGV
-     */
     @ApiModelProperty(value= "AGV")
     private Long agvId;
 
-    /**
-     * 宸ヤ綔鏃堕棿
-     */
     @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
     private Date ioTime;
 
-    /**
-     * 寮�濮嬫椂闂�
-     */
     @ApiModelProperty(value= "寮�濮嬫椂闂�")
     private Date startTime;
 
-    /**
-     * 缁撴潫鏃堕棿
-     */
     @ApiModelProperty(value= "缁撴潫鏃堕棿")
     private Date endTime;
 
-    /**
-     * 寮傚父鏃堕棿
-     */
     @ApiModelProperty(value= "寮傚父鏃堕棿")
     private Date errTime;
 
-    /**
-     * 璧峰绔�
-     */
     @ApiModelProperty(value= "璧峰绔�")
     private Long oriSta;
 
-    /**
-     * 璧峰搴撲綅
-     */
     @ApiModelProperty(value= "璧峰搴撲綅")
     private Long oriLoc;
 
-    /**
-     * 璧峰鐮�
-     */
     @ApiModelProperty(value= "璧峰鐮�")
     private Long oriCode;
 
-    /**
-     * 璧峰宸烽亾鍝堝笇
-     */
     @ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
-    private Long oriLaneHash;
+    private String oriLaneHash;
 
-    /**
-     * 鐩爣绔�
-     */
     @ApiModelProperty(value= "鐩爣绔�")
     private Long destSta;
 
-    /**
-     * 鐩爣搴撲綅
-     */
     @ApiModelProperty(value= "鐩爣搴撲綅")
     private Long destLoc;
 
-    /**
-     * 鐩爣鐮�
-     */
     @ApiModelProperty(value= "鐩爣鐮�")
     private Long destCode;
 
-    /**
-     * 鐩爣宸烽亾鍝堝笇
-     */
     @ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
-    private Long destLaneHash;
+    private String destLaneHash;
 
-    /**
-     * 绌烘澘
-     */
     @ApiModelProperty(value= "绌烘澘")
     private String emptyMk;
 
-    /**
-     * 鎵樼洏鐮�
-     */
+    @ApiModelProperty(value= "涓婅鐘舵��")
+    private String uplinkSts;
+
     @ApiModelProperty(value= "鎵樼洏鐮�")
     private String zpallet;
 
-    /**
-     * 鐜妭
-     */
     @ApiModelProperty(value= "鐜妭")
     private String phase;
 
-    /**
-     * 寮傚父鎻忚堪
-     */
     @ApiModelProperty(value= "寮傚父鎻忚堪")
     private String errDesc;
 
-    /**
-     * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
-     */
     @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  ")
     private Integer status;
 
-    /**
-     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
-     */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
     private Integer deleted;
 
-    /**
-     * 绉熸埛
-     */
     @ApiModelProperty(value= "绉熸埛")
     private Long tenantId;
 
-    /**
-     * 娣诲姞浜哄憳
-     */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
     private Long createBy;
 
-    /**
-     * 娣诲姞鏃堕棿
-     */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     private Date createTime;
 
-    /**
-     * 淇敼浜哄憳
-     */
     @ApiModelProperty(value= "淇敼浜哄憳")
     private Long updateBy;
 
-    /**
-     * 淇敼鏃堕棿
-     */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     private Date updateTime;
 
-    /**
-     * 澶囨敞
-     */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
@@ -400,8 +304,12 @@
         if (null != this.oriLoc) {
             oriDesc = "LOC" + " - " + this.getOriLoc$();
         }
-        if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
-            oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+        if (!Cools.isEmpty(oriDesc)) {
+            if (null != this.oriCode) {
+                oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+            }
+        } else {
+            oriDesc = "CODE" + " - " + this.getOriCode$();
         }
         return oriDesc;
     }
@@ -414,8 +322,12 @@
         if (null != this.destLoc) {
             destDesc = "LOC" + " - " + this.getDestLoc$();
         }
-        if (!Cools.isEmpty(destDesc) && null != this.destCode) {
-            destDesc = destDesc + " (" + this.getDestCode$() + ")";
+        if (!Cools.isEmpty(destDesc)) {
+            if (null != this.destCode) {
+                destDesc = destDesc + " (" + this.getDestCode$() + ")";
+            }
+        } else {
+            destDesc = "CODE" + " - " + this.getDestCode$();
         }
         return destDesc;
     }

--
Gitblit v1.9.1