From c99ccf370df6d868397b06d720dba6842b9bb161 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 四月 2025 14:49:37 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 5eb0b73..bacd303 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -1,18 +1,20 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.CompanysService;
 import com.vincent.rsf.server.manager.service.ShipperService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
+import io.swagger.annotations.Api;
 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;
@@ -22,6 +24,7 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 @TableName("man_warehouse_areas")
@@ -37,10 +40,16 @@
     private Long id;
 
     /**
+     * 浠撳簱ID
+     */
+    @ApiModelProperty("浠撳簱ID")
+    private Long warehouseId;
+
+    /**
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
-    private String uuid;
+    private String type;
 
     /**
      * 鍚嶇О
@@ -113,6 +122,7 @@
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -126,9 +136,18 @@
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+
+    @TableField(exist = false)
+    @ApiModelProperty("鏄惁浠撳簱")
+    private Integer flagWare;
+
+    @TableField(exist = false)
+    @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+    private Long index;
     /**
      * 澶囨敞
      */
@@ -138,7 +157,7 @@
     public WarehouseAreas() {}
 
     public WarehouseAreas(String uuid,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
-        this.uuid = uuid;
+        this.type = uuid;
         this.name = name;
         this.code = code;
         this.shipperId = shipperId;
@@ -176,14 +195,33 @@
 //    );
 
     public String getShipperId$(){
-        ShipperService service = SpringUtils.getBean(ShipperService.class);
-        Shipper shipper = service.getById(this.shipperId);
+        CompanysService service = SpringUtils.getBean(CompanysService.class);
+        Companys shipper = service.getById(this.shipperId);
         if (!Cools.isEmpty(shipper)){
             return String.valueOf(shipper.getName());
         }
         return null;
     }
 
+    public String getWarehouseId$() {
+        if (this.warehouseId == null) { return null; }
+        WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
+        Warehouse warehouse = warehouseService.getById(this.warehouseId);
+        if (!Objects.isNull(warehouse)) {
+            return warehouse.getName();
+        }
+        return null;
+    }
+
+    public String getSupplierId$() {
+        CompanysService service = SpringUtils.getBean(CompanysService.class);
+        Companys supplier = service.getById(this.supplierId);
+        if (!Cools.isEmpty(supplier)){
+            return String.valueOf(supplier.getName());
+        }
+        return null;
+    }
+
     public String getFlagMinus$(){
         if (null == this.flagMinus){ return null; }
         switch (this.flagMinus){

--
Gitblit v1.9.1