From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 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 5007896..826c0bf 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,8 @@
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;
import java.text.SimpleDateFormat;
@@ -42,6 +44,12 @@
*/
@ApiModelProperty(value= "鐗╂枡ID")
private Long areaId;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty("涓诲崟ID")
+ private Long areaMatId;
/**
* 缂栧彿
@@ -83,7 +91,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -103,6 +110,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;
/**
@@ -116,6 +124,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;
/**
@@ -160,6 +169,52 @@
// null // 澶囨敞
// );
+ public String getAreaId$(){
+ WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
+ WarehouseAreas warehouseAreas = service.getById(this.areaId);
+ if (!Cools.isEmpty(warehouseAreas)){
+ return String.valueOf(warehouseAreas.getName());
+ }
+ return null;
+ }
+
+ public String getMatnrId$(){
+ MatnrService service = SpringUtils.getBean(MatnrService.class);
+ Matnr matnr = service.getById(this.matnrId);
+ if (!Cools.isEmpty(matnr)){
+ return String.valueOf(matnr.getName());
+ }
+ return null;
+ }
+
+ public String getGroupId$(){
+ MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
+ MatnrGroup matnrGroup = service.getById(this.groupId);
+ if (!Cools.isEmpty(matnrGroup)){
+ return String.valueOf(matnrGroup.getName());
+ }
+ return null;
+ }
+
+ public String getLocTypeId$(){
+ LocTypeService service = SpringUtils.getBean(LocTypeService.class);
+ LocType locType = service.getById(this.locTypeId);
+ if (!Cools.isEmpty(locType)){
+ return String.valueOf(locType.getName());
+ }
+ return null;
+ }
+
+ public String getLocId$(){
+ LocService service = SpringUtils.getBean(LocService.class);
+ Loc loc = service.getById(this.locId);
+ if (!Cools.isEmpty(loc)){
+ return String.valueOf(loc.getCode());
+ }
+ return null;
+ }
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1