From cd55f83ee6fe0e3002df2018f50f4ca8d066b1e6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 24 一月 2026 14:16:18 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java |   77 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 3 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 9ebe1a3..5946b27 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
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -11,9 +12,6 @@
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,6 +20,7 @@
 import com.vincent.rsf.server.system.service.UserService;
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
+import java.util.Map;
 import java.util.Objects;
 
 @Data
@@ -65,6 +64,18 @@
 
     @ApiModelProperty("鍗曟嵁ID")
     private Long orderId;
+
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+    private String platOrderCode;
+
+    @ApiModelProperty("宸ュ崟鍙�")
+    private String platWorkCode;
+
+    @ApiModelProperty("椤圭洰鍙�")
+    private String projectCode;
 
     @ApiModelProperty("鍗曟嵁绫诲瀷")
     private String orderType;
@@ -139,6 +150,10 @@
     @ApiModelProperty(value= "瀛楁绱㈠紩")
     private String fieldsIndex;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
      */
@@ -149,6 +164,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -191,6 +207,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public TaskItem() {}
 
     public TaskItem(Long taskId,Long matnrId,String maktx,String matnrCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -247,6 +305,19 @@
         return dictDatas.getLabel();
     }
 
+    public String getWkType$(){
+        if (Cools.isEmpty(this.wkType)){
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
+
     public String getIsptResult$(){
         if (Cools.isEmpty(this.isptResult)){
             return null;

--
Gitblit v1.9.1