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/WarehouseAreas.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 ee03739..8e5386f 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
@@ -38,6 +38,12 @@
private Long id;
/**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty("浠撳簱ID")
+ private Long wareId;
+
+ /**
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
@@ -185,6 +191,15 @@
return null;
}
+ public String getSupplier$() {
+ 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