From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index 3dfa6cf..38ae934 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.framework.common.DateUtils;
+import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
 import com.vincent.rsf.server.system.constant.DictTypeCode;
 import com.vincent.rsf.server.system.entity.DictData;
 import com.vincent.rsf.server.system.service.DictDataService;
@@ -25,7 +28,6 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Objects;
 
 @Data
 @Accessors(chain = true)
@@ -79,6 +81,29 @@
      */
     @ApiModelProperty(value= "鐗╂枡ID")
     private Long matnrId;
+
+    /**
+     * 骞冲彴鏍囪瘑锛堣鍙凤級
+     */
+    @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+    private String platItemId;
+
+    @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+    private String platOrderCode;
+
+    @ApiModelProperty("宸ュ崟鍙�")
+    private String platWorkCode;
+
+    @ApiModelProperty("椤圭洰鍙�")
+    private String projectCode;
+
+    @ApiModelProperty("鍑哄簱鏁伴噺")
+    @TableField(exist = false)
+    private Double outQty;
+
+    @ApiModelProperty("宸烽亾")
+    @TableField(exist = false)
+    private Integer channel;
 
     /**
      * 鐗╂枡鍚嶇О
@@ -148,6 +173,14 @@
     @ApiModelProperty(value= "瀛楁绱㈠紩")
     private String fieldsIndex;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
+    @ApiModelProperty("鎵樼洏鐮�")
+    @TableField(exist = false)
+    private String barcode;
+
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
      */
@@ -158,6 +191,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -186,6 +220,9 @@
     @ApiModelProperty(value= "淇敼浜哄憳")
     private Long updateBy;
 
+    @ApiModelProperty("渚涘簲鍟咺D")
+    private Long splrId;
+
     /**
      * 淇敼鏃堕棿
      */
@@ -195,14 +232,17 @@
     private Date updateTime;
 
     @TableField(exist = false)
-    private Long waveId;
+    private Long sourceId;
 
     @TableField(exist = false)
-    private Long waveItemId;
+    private Long source;
 
     @TableField(exist = false)
-    private String waveCode;
+    private String sourceCode;
 
+    @ApiModelProperty("鍑虹珯鍙�")
+    @TableField(exist = false)
+    private String site;
 
 
     /**
@@ -267,6 +307,18 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getWareArea(){
+        if (Cools.isEmpty(this.locId)){
+            return "";
+        }
+        LocService locService = SpringUtils.getBean(LocService.class);
+        Loc loc = locService.getById(this.locId);
+        if (Objects.isNull(loc)) {
+            return null;
+        }
+        return loc.getAreaId$();
+    }
+
     public String getType$(){
         if (Cools.isEmpty(this.type)){
             return "";
@@ -291,6 +343,10 @@
         return dictData.getLabel();
     }
 
+    public Double getReviseQty() {
+        return this.anfme;
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
@@ -301,6 +357,11 @@
             default:
                 return String.valueOf(this.status);
         }
+    }
+
+    public Integer getDeadTime() {
+        if (null == this.createTime){ return null; }
+        return DateUtils.diff(createTime, new Date());
     }
 
     public String getCreateBy$(){
@@ -334,8 +395,6 @@
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
-
-
 
     public Boolean getStatusBool(){
         if (null == this.status){ return null; }

--
Gitblit v1.9.1