From 0d3a5be1512815a38f37ae81e7d9fc0948fd3f16 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:54:57 +0800
Subject: [PATCH] 1

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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..4010a81 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
@@ -4,6 +4,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.vincent.rsf.server.manager.service.CompanysService;
 import com.vincent.rsf.server.manager.service.ShipperService;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
@@ -37,10 +38,16 @@
     private Long id;
 
     /**
+     * 浠撳簱ID
+     */
+    @ApiModelProperty("浠撳簱ID")
+    private Long wareId;
+
+    /**
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
-    private String uuid;
+    private String type;
 
     /**
      * 鍚嶇О
@@ -138,7 +145,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,8 +183,8 @@
 //    );
 
     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());
         }

--
Gitblit v1.9.1