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/WaitPakinItem.java |   92 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 9535a42..b21a170 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -1,19 +1,21 @@
 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.*;
 
+import java.text.SimpleDateFormat;
+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;
 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;
 import lombok.Data;
@@ -50,6 +52,12 @@
     @ApiModelProperty("涓氬姟绫诲瀷")
     private Short wkType;
 
+    @ApiModelProperty("缁勬嫋鏄庣粏ID")
+    private Long source;
+
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
     /**
      * 璁㈠崟ID
      */
@@ -73,6 +81,18 @@
      */
     @ApiModelProperty("鐗╂枡璺熻釜鐮�")
     private String trackCode;
+
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+    private String platOrderCode;
+
+    @ApiModelProperty("宸ュ崟鍙�")
+    private String platWorkCode;
+
+    @ApiModelProperty("椤圭洰鍙�")
+    private String projectCode;
 
     /**
      * 鐗╂枡鍚嶇О
@@ -138,6 +158,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -160,6 +181,9 @@
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
     /**
      * 淇敼浜哄憳
      */
@@ -180,6 +204,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 WaitPakinItem() {}
 
     public WaitPakinItem(Long pakinId,String maktx,Long matnrId,String matnrCode,Double anfme,Double workQty,String unit,String fieldsIndex,Double qty,String batch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -261,6 +327,20 @@
         return null;
     }
 
+    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 getUpdateTime$(){
         if (Cools.isEmpty(this.updateTime)){
             return "";

--
Gitblit v1.9.1