From d871326f5ad1c55367333e1cb1aaf93e87989bea Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 09:39:42 +0800
Subject: [PATCH] 库存出库功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java |   92 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 85 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 6382e57..dd072f1 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
@@ -1,18 +1,23 @@
 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.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;
 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;
@@ -77,6 +82,25 @@
     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(value= "鐗╂枡鍚嶇О")
@@ -106,8 +130,10 @@
     @ApiModelProperty(value= "鏁伴噺")
     private Double anfme;
 
+
     @ApiModelProperty("鎵ц鏁伴噺")
     private Double workQty;
+
 
     @ApiModelProperty("瀹屾垚鏁伴噺")
     private Double qty;
@@ -142,6 +168,10 @@
     @ApiModelProperty(value= "瀛楁绱㈠紩")
     private String fieldsIndex;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
      */
@@ -152,7 +182,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -172,6 +201,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;
 
     /**
@@ -185,7 +215,19 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
+
+    @TableField(exist = false)
+    private Long waveId;
+
+    @TableField(exist = false)
+    private Long waveItemId;
+
+    @TableField(exist = false)
+    private String waveCode;
+
+
 
     /**
      * 澶囨敞
@@ -249,6 +291,42 @@
 //            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 "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, this.type));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.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 getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1