From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:29:06 +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/LocAreaMatRela.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
index e7363d0..fe2e182 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
@@ -4,6 +4,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -43,6 +44,12 @@
*/
@ApiModelProperty(value= "鐗╂枡ID")
private Long areaId;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty("涓诲崟ID")
+ private Long areaMatId;
/**
* 缂栧彿
@@ -104,6 +111,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -117,6 +125,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -165,7 +174,7 @@
WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
WarehouseAreas warehouseAreas = service.getById(this.areaId);
if (!Cools.isEmpty(warehouseAreas)){
- return String.valueOf(warehouseAreas.getCode());
+ return String.valueOf(warehouseAreas.getName());
}
return null;
}
@@ -174,7 +183,7 @@
MatnrService service = SpringUtils.getBean(MatnrService.class);
Matnr matnr = service.getById(this.matnrId);
if (!Cools.isEmpty(matnr)){
- return String.valueOf(matnr.getUnit());
+ return String.valueOf(matnr.getName());
}
return null;
}
@@ -183,7 +192,7 @@
MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
MatnrGroup matnrGroup = service.getById(this.groupId);
if (!Cools.isEmpty(matnrGroup)){
- return String.valueOf(matnrGroup.getCode());
+ return String.valueOf(matnrGroup.getName());
}
return null;
}
@@ -201,7 +210,7 @@
LocService service = SpringUtils.getBean(LocService.class);
Loc loc = service.getById(this.locId);
if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getWarehouseId());
+ return String.valueOf(loc.getCode());
}
return null;
}
--
Gitblit v1.9.1