From e98e114ff8765ca1ffbd6dda167e35d18b72f5d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 16:34:07 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 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..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
@@ -4,7 +4,9 @@
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 com.vincent.rsf.server.manager.service.WarehouseService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,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")
@@ -37,10 +40,16 @@
private Long id;
/**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty("浠撳簱ID")
+ private Long warehouseId;
+
+ /**
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
- private String uuid;
+ private String type;
/**
* 鍚嶇О
@@ -138,7 +147,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,14 +185,33 @@
// );
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());
}
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);
+ 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