From 2db2c1328008ae399d8d7af56c9c6dc67a47bce8 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocTypeRela.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocTypeRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocTypeRela.java
index f26a29b..80a51e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocTypeRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocTypeRela.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.service.WarehouseService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -50,4 +53,39 @@
this.typeId = typeId;
}
+// /**
+// * @author Ryan
+// * @description 鑾峰彇搴撲綅
+// * @param
+// * @return
+// * @time 2025/3/24 10:28
+// */
+// public String getLocId$() {
+// if (this.warehouseId == null) { return null; }
+// WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
+// Warehouse warehouse = warehouseService.getById(this.warehouseId);
+// if (Objects.isNull(warehouse)) {
+// return null;
+// }
+// return warehouse.getName();
+// }
+
+ /**
+ * @author Ryan
+ * @description 鑾峰彇搴撳尯鍚嶇О
+ * @param
+ * @return
+ * @time 2025/3/24 10:27
+ */
+ public String getAreaId$() {
+ if (this.locId == null) { return null; }
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc byId = locService.getById(this.locId);
+ if (Objects.isNull(byId)) {
+ return null;
+ }
+ return byId.getCode();
+ }
+
+
}
--
Gitblit v1.9.1