From 7925e2cfcdcb39e9ac6793edd5362bbe369def5c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 22 五月 2025 17:39:46 +0800
Subject: [PATCH] 保存拣料入库流水

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 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 01e29f1..41762dc 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,6 +4,7 @@
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
 import com.vincent.rsf.server.system.entity.DictData;
 import com.vincent.rsf.server.system.service.DictDataService;
@@ -34,10 +35,8 @@
 @Data
 @Accessors(chain = true)
 @TableName("man_task")
+@ApiModel(value = "Task", description = "浠诲姟妗�")
 public class Task implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
     /**
      * ID
      */
@@ -55,13 +54,19 @@
      * 浠诲姟鐘舵��
      */
     @ApiModelProperty(value= "浠诲姟鐘舵��")
-    private Short taskStatus;
+    private Integer taskStatus;
+
+    @ApiModelProperty("涓婄骇浠诲姟ID")
+    private Long parentId;
+
+    @ApiModelProperty("浠撳簱绫诲瀷")
+    private Integer warehType;
 
     /**
      * 浠诲姟绫诲瀷
      */
     @ApiModelProperty(value= "浠诲姟绫诲瀷")
-    private Short taskType;
+    private Integer taskType;
 
     /**
      * 婧愬簱浣�
@@ -147,7 +152,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -167,6 +171,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;
 
     /**
@@ -180,6 +185,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;
 
     /**
@@ -190,7 +196,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,Short 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;
@@ -249,7 +255,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getTaskType$() {
@@ -263,7 +269,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