From b011b1368c2f8813ef2684a4a63914e6e59b5e15 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 05 六月 2025 17:06:51 +0800
Subject: [PATCH] DO单优化 出库单优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 278ef22..74ec628 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -4,10 +4,13 @@
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.TaskService;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
 import com.vincent.rsf.server.system.entity.DictData;
 import com.vincent.rsf.server.system.service.DictDataService;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -30,6 +33,7 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.stream.Collectors;
 
 @Data
 @Accessors(chain = true)
@@ -53,13 +57,19 @@
      * 浠诲姟鐘舵��
      */
     @ApiModelProperty(value= "浠诲姟鐘舵��")
-    private Short taskStatus;
+    private Integer taskStatus;
+
+    @ApiModelProperty("涓婄骇浠诲姟ID")
+    private Long parentId;
+
+    @ApiModelProperty("浠撳簱绫诲瀷")
+    private String warehType;
 
     /**
      * 浠诲姟绫诲瀷
      */
     @ApiModelProperty(value= "浠诲姟绫诲瀷")
-    private Short taskType;
+    private Integer taskType;
 
     /**
      * 婧愬簱浣�
@@ -113,7 +123,7 @@
      * 浼樺厛绾�
      */
     @ApiModelProperty(value= "浼樺厛绾�")
-    private Short sort;
+    private Integer sort;
 
     /**
      * 寮傚父缂栫爜
@@ -145,6 +155,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -164,6 +175,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -177,6 +189,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -187,7 +200,7 @@
 
     public Task() {}
 
-    public Task(String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Task(String taskCode,Integer taskStatus,Integer taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Integer sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.taskCode = taskCode;
         this.taskStatus = taskStatus;
         this.taskType = taskType;
@@ -235,6 +248,16 @@
 //            null    // 澶囨敞
 //    );
 
+//    public String getParentId$() {
+//        if (Cools.isEmpty(this.parentId)) {
+//            return null;
+//        }
+//        TaskService taskService = SpringUtils.getBean(TaskService.class);
+//        Task task = taskService.getById(this.parentId);
+//        return task.getTaskCode();
+//    }
+
+
     public String getTaskStatus$(){
         if (Cools.isEmpty(this.taskStatus)) {
             return null;
@@ -244,6 +267,18 @@
                 .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_STATUS)
                 .eq(DictData::getValue, this.taskStatus));
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+            return null;
+        }
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
+    }
+
+    public String getWarehType$(){
+        if (null == this.warehType){ return null; }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
+                .eq(DictData::getValue, warehType));
+        if (Objects.isNull(dictDatas)) {
             return null;
         }
         return dictDatas.getLabel();
@@ -260,7 +295,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getStartTime$(){

--
Gitblit v1.9.1