From 1864f916e0359d0814416cf94feda3a3662ed193 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 05 九月 2025 16:39:29 +0800
Subject: [PATCH] 1

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java |   73 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 19 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 6084e4a..5c057d9 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
@@ -74,7 +74,7 @@
     private Long agvId;
 
     /**
-     * 宸ヤ綔鏃堕棿
+     * 宸ヤ綔鏃堕棿銆佷换鍔″垎閰嶆椂闂�
      */
     @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
     private Date ioTime;
@@ -116,6 +116,12 @@
     private Long oriCode;
 
     /**
+     * 璧峰宸烽亾鍝堝笇
+     */
+    @ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
+    private String oriLaneHash;
+
+    /**
      * 鐩爣绔�
      */
     @ApiModelProperty(value= "鐩爣绔�")
@@ -132,6 +138,12 @@
      */
     @ApiModelProperty(value= "鐩爣鐮�")
     private Long destCode;
+
+    /**
+     * 鐩爣宸烽亾鍝堝笇
+     */
+    @ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
+    private String destLaneHash;
 
     /**
      * 绌烘澘
@@ -173,13 +185,13 @@
      * 绉熸埛
      */
     @ApiModelProperty(value= "绉熸埛")
-    private Integer tenantId;
+    private Long tenantId;
 
     /**
      * 娣诲姞浜哄憳
      */
     @ApiModelProperty(value= "娣诲姞浜哄憳")
-    private Integer createBy;
+    private Long createBy;
 
     /**
      * 娣诲姞鏃堕棿
@@ -191,7 +203,7 @@
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
-    private Integer updateBy;
+    private Long updateBy;
 
     /**
      * 淇敼鏃堕棿
@@ -207,7 +219,7 @@
 
     public Task() {}
 
-    public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+    public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.uuid = uuid;
         this.busId = busId;
         this.seqNum = seqNum;
@@ -273,7 +285,7 @@
         BusService service = SpringUtils.getBean(BusService.class);
         Bus bus = service.getById(this.busId);
         if (!Cools.isEmpty(bus)){
-            return String.valueOf(bus.getUuid());
+            return String.valueOf(bus.getBusNo());
         }
         return null;
     }
@@ -368,29 +380,52 @@
         return null;
     }
 
-    public String getStatus$(){
+    public Boolean getStatusBool(){
         if (null == this.status){ return null; }
         switch (this.status){
             case 1:
-                return "姝ｅ父";
+                return true;
             case 0:
-                return "鍐荤粨";
+                return false;
             default:
-                return String.valueOf(this.status);
+                return null;
         }
     }
 
-    public String getDeleted$(){
-        if (null == this.deleted){ return null; }
-        switch (this.deleted){
-            case 1:
-                return "鏄�";
-            case 0:
-                return "鍚�";
-            default:
-                return String.valueOf(this.deleted);
+    public String getOriDesc() {
+        String oriDesc = "";
+        if (null != this.oriSta) {
+            oriDesc = "STA" + " - " + this.getOriSta$();
         }
+        if (null != this.oriLoc) {
+            oriDesc = "LOC" + " - " + this.getOriLoc$();
+        }
+        if (!Cools.isEmpty(oriDesc)) {
+            if (null != this.oriCode) {
+                oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+            }
+        } else {
+            oriDesc = "CODE" + " - " + this.getOriCode$();
+        }
+        return oriDesc;
     }
 
+    public String getDestDesc() {
+        String destDesc = "";
+        if (null != this.destSta) {
+            destDesc = "STA" + " - " + this.getDestSta$();
+        }
+        if (null != this.destLoc) {
+            destDesc = "LOC" + " - " + this.getDestLoc$();
+        }
+        if (!Cools.isEmpty(destDesc)) {
+            if (null != this.destCode) {
+                destDesc = destDesc + " (" + this.getDestCode$() + ")";
+            }
+        } else {
+            destDesc = "CODE" + " - " + this.getDestCode$();
+        }
+        return destDesc;
+    }
 
 }

--
Gitblit v1.9.1