From 20381172d906c4092b9249a9aea2aec85c1bf4e4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 16:59:25 +0800
Subject: [PATCH] #逻辑删除
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 22 +++++++++++++---------
1 files changed, 13 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 46c25f4..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,10 +5,13 @@
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;
import com.vincent.rsf.server.manager.service.ShipperService;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -245,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;
/**
@@ -258,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;
/**
@@ -364,15 +369,14 @@
}
return null;
}
-
- public String getRglarId$(){
- BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
- BatchRegular 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