From 51e9b24c421dd2e77ec5809a62c35fec115d5876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:12:02 +0800
Subject: [PATCH] #添加 1. 添加库位逻辑分区 2. 物料添加自动生成编码 3. 库区字段显示优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 8e5386f..68c7924 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
@@ -6,6 +6,7 @@
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 org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -23,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")
@@ -41,7 +43,7 @@
* 浠撳簱ID
*/
@ApiModelProperty("浠撳簱ID")
- private Long wareId;
+ private Long warehouseId;
/**
* 缂栧彿
@@ -191,6 +193,16 @@
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 getSupplier$() {
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys supplier = service.getById(this.supplierId);
--
Gitblit v1.9.1