From 0b3cdb1e0c2f495edb971c585bd6b4b0456bf93a Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 14:55:34 +0800
Subject: [PATCH] 字段变更 增加类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 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..6719ea4 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;
@@ -53,6 +54,10 @@
*/
@ApiModelProperty(value= "鐗╂枡缂栫爜")
private String code;
+
+ /** 鎵规锛涚┖涓茶〃绀烘棤鎵规锛屾鏃剁墿鏂欑紪鐮佸叏灞�鍞竴锛涢潪绌烘椂鐗╂枡缂栫爜+鎵规缁勫悎鍞竴 */
+ @ApiModelProperty(value = "鎵规")
+ private String batch;
/**
* 璐т富ID
@@ -230,6 +235,21 @@
@TableField(exist = false)
private Map<String, String> extendFields;
+ /** 搴撳瓨鏁伴噺锛堝嚭搴撻�夌墿鏂欐椂鐢卞簱浣嶆眹鎬伙紝闈炶〃瀛楁锛� */
+ @ApiModelProperty("搴撳瓨鏁伴噺")
+ @TableField(exist = false)
+ private Double stockQty;
+
+ /** 搴撲綅鐘舵�佸睍绀猴紙鍑哄簱閫夌墿鏂欐椂锛岄潪琛ㄥ瓧娈碉級 */
+ @ApiModelProperty("搴撲綅鐘舵��")
+ @TableField(exist = false)
+ private String locUseStatus$;
+
+ /** 搴撲綅灞曠ず锛堝嚭搴撻�夌墿鏂欐椂锛屾湁搴撳瓨鐨勫簱浣嶇紪鐮侊紝閫楀彿鍒嗛殧锛岄潪琛ㄥ瓧娈碉級 */
+ @ApiModelProperty("搴撲綅")
+ @TableField(exist = false)
+ private String locCodes$;
+
/**
* 绉熸埛
*/
@@ -247,6 +267,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 +281,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 +388,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