From c46d1d8c3b9875f051a6ec3c4a1d3fa7bd32e5db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:21 +0800
Subject: [PATCH] 新增库存管理 新增库存明细

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 5424d53..34fb5c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -1,21 +1,19 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 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;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +23,7 @@
 import com.vincent.rsf.server.system.service.UserService;
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
-import java.util.Date;
+import java.util.Map;
 import java.util.Objects;
 
 @Data
@@ -61,6 +59,12 @@
     @ApiModelProperty("婧愮紪鐮�")
     private Long source;
 
+    @ApiModelProperty("婧愬崟鍙�")
+    private String sourceCode;
+
+    @ApiModelProperty("婧愪富鍗旾D")
+    private Long sourceId;
+
     @ApiModelProperty("鍗曟嵁ID")
     private Long orderId;
 
@@ -77,6 +81,9 @@
      */
     @ApiModelProperty("鐗╂枡璺熻釜鐮�")
     private String trackCode;
+
+    @ApiModelProperty("渚涘簲鍟嗘尝娆�")
+    private String splrBatch;
     /**
      * 鐗╂枡缂栫爜
      */
@@ -96,6 +103,18 @@
     private Double anfme;
 
     /**
+     * 鎵ц鏁伴噺
+     */
+    @ApiModelProperty("搴撳瓨鏁伴噺")
+    private Double workQty;
+
+    /**
+     * 瀹屾垚鏁伴噺
+     */
+    @ApiModelProperty("瀹屾垚鏁伴噺")
+    private Double qty;
+
+    /**
      * 搴撳瓨鎵规
      */
     @ApiModelProperty(value= "搴撳瓨鎵规")
@@ -113,11 +132,18 @@
     @ApiModelProperty(value= "鍨嬪彿")
     private String model;
 
+    @ApiModelProperty("璐ㄦ鐘舵��")
+    private Short isptResult;
+
     /**
      * 瀛楁绱㈠紩
      */
     @ApiModelProperty(value= "瀛楁绱㈠紩")
     private String fieldsIndex;
+
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
@@ -148,6 +174,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;
 
     /**
@@ -161,6 +188,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;
 
     /**
@@ -225,6 +253,20 @@
         return dictDatas.getLabel();
     }
 
+    public String getIsptResult$(){
+        if (Cools.isEmpty(this.isptResult)){
+            return null;
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+                .eq(DictData::getValue, this.isptResult));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1