From 183d1e50c7b9a040e39eec36de81e5331aa7b31c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:58:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 4010a81..0416ab5 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,8 +4,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
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 +25,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 +44,7 @@
* 浠撳簱ID
*/
@ApiModelProperty("浠撳簱ID")
- private Long wareId;
+ private Long warehouseId;
/**
* 缂栧彿
@@ -120,6 +123,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -133,6 +137,7 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -191,6 +196,25 @@
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 getSupplierId$() {
+ 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