From a4112a5d31fa3a66daafdc009ff3b3047bb98f67 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 17:14:04 +0800
Subject: [PATCH] #巷道
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index cc4b194..69c696a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -5,6 +5,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
@@ -247,6 +248,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;
/**
@@ -260,6 +262,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;
/**
@@ -366,15 +369,14 @@
}
return null;
}
-
- public String getRglarId$(){
- SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
- SerialRule batchRegular = service.getById(this.rglarId);
- if (!Cools.isEmpty(batchRegular)){
- return String.valueOf(batchRegular.getCode());
- }
- return null;
- }
+// public String getRglarId$(){
+// SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
+// SerialRule batchRegular = service.getById(this.rglarId);
+// if (!Cools.isEmpty(batchRegular)){
+// return String.valueOf(batchRegular.getCode());
+// }
+// return null;
+// }
public String getStockLeval$(){
if (null == this.stockLevel){ return null; }
--
Gitblit v1.9.1