From 5ddf26e390c8ba6e35dfbf93502c9a46f1bc356c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 11:35:52 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 8781760..6c4a9ad 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -302,6 +304,26 @@
}
}
+ public String getWarehouseId$(){
+ if (null == this.warehouseId){ return null; }
+ WarehouseService service = SpringUtils.getBean(WarehouseService.class);
+ Warehouse warehouse = service.getById(this.warehouseId);
+ if (!Cools.isEmpty(warehouse)){
+ return String.valueOf(warehouse.getName());
+ }
+ return null;
+ }
+
+ public String getAreaId$(){
+ if (null == this.areaId){ return null; }
+ WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
+ WarehouseAreas warehouseAreas = service.getById(this.areaId);
+ if (!Cools.isEmpty(warehouseAreas)){
+ return String.valueOf(warehouseAreas.getName());
+ }
+ return null;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1