From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java |  112 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index 10f1fc3..3e81bb9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -182,6 +183,7 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
     private Integer deleted;
 
     /**
@@ -196,6 +198,9 @@
     @ApiModelProperty(value= "娣诲姞浜哄憳")
     private Long createBy;
 
+    @TableField(exist = false)
+    private String createBy$;
+
     /**
      * 娣诲姞鏃堕棿
      */
@@ -209,6 +214,9 @@
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
     private Long updateBy;
+
+    @TableField(exist = false)
+    private String updateBy$;
 
     @ApiModelProperty("鏄惁鍚堟牸")
     private Short flagNorm;
@@ -233,6 +241,58 @@
      */
     @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;
+    @TableField(exist = false)
+    private String shipperId$;
+
+    @TableField(exist = false)
+    private String splrId$;
+
+    @TableField(exist = false)
+    private String isptResult$;
+
 
     public WarehouseAreasItem() {}
 
@@ -290,22 +350,20 @@
 //            null    // 澶囨敞
 //    );
 
+    public BigDecimal getAbleQty(){
+        BigDecimal anfmeDec = this.anfme != null ? new BigDecimal(this.anfme.toString()) : BigDecimal.ZERO;
+        BigDecimal workQtyDec = this.workQty != null ? new BigDecimal(this.workQty.toString()) : BigDecimal.ZERO;
+        BigDecimal qtyDec = this.qty != null ? new BigDecimal(this.qty.toString()) : BigDecimal.ZERO;
+
+        return anfmeDec.subtract(workQtyDec).subtract(qtyDec);
+    }
+
     public String getShipperId$(){
-        CompanysService service = SpringUtils.getBean(CompanysService.class);
-        Companys companys = service.getById(this.shipperId);
-        if (!Cools.isEmpty(companys)){
-            return String.valueOf(companys.getName());
-        }
-        return null;
+        return this.shipperId$;
     }
 
     public String getSplrId$(){
-        CompanysService service = SpringUtils.getBean(CompanysService.class);
-        Companys companys = service.getById(this.splrId);
-        if (!Cools.isEmpty(companys)){
-            return String.valueOf(companys.getName());
-        }
-        return null;
+        return this.splrId$;
     }
 
     public String getStatus$(){
@@ -320,15 +378,6 @@
         }
     }
 
-    public String getCreateBy$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.createBy);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getNickname());
-        }
-        return null;
-    }
-
     public String getCreateTime$(){
         if (Cools.isEmpty(this.createTime)){
             return "";
@@ -336,27 +385,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
-    public String getUpdateBy$(){
-        UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.getById(this.updateBy);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getNickname());
-        }
-        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();
+        return this.isptResult$;
     }
 
     public String getUpdateTime$(){

--
Gitblit v1.9.1