From 25afd6ad3665690ecad3eed2fee7ffba7364d70a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 15 八月 2024 09:27:02 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
index ca2d51a..e69f3d6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -2,20 +2,18 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.wms.asrs.service.TagService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -24,7 +22,6 @@
import com.zy.asrs.wms.system.service.HostService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("man_mat")
@@ -253,14 +250,26 @@
private String deadTime;
/**
- * 鎵╁睍瀛楁
+ * 瀹夊叏搴撳瓨涓婇檺
*/
- @ApiModelProperty(value= "鎵╁睍瀛楁")
- private String extend;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓婇檺")
+ private Double safeStockLimit;
+
+ /**
+ * 瀹夊叏搴撳瓨涓嬮檺
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨涓嬮檺")
+ private Double safeStockMinimum;
+
+ /**
+ * 鏈夋晥鏈�
+ */
+ @ApiModelProperty(value= "鏈夋晥鏈�")
+ private String validity;
public Mat() {}
- public Mat(String uuid,String flag,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,String units,String barcode,String origin,String manu,String manuDate,String itemNum,String weight,String length,String volume,String threeCode,String supp,String suppCode,String deadTime) {
+ public Mat(String uuid, String flag, Integer sort, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, String weight, String length, String volume, String threeCode, String supp, String suppCode, String deadTime, Double safeStockLimit, Double safeStockMinimum, String validity) {
this.uuid = uuid;
this.flag = flag;
this.sort = sort;
@@ -296,9 +305,12 @@
this.supp = supp;
this.suppCode = suppCode;
this.deadTime = deadTime;
+ this.safeStockLimit = safeStockLimit;
+ this.safeStockMinimum = safeStockMinimum;
+ this.validity = validity;
}
-// Mat mat = new Mat(
+ // Mat mat = new Mat(
// null, // 缂栧彿
// null, // 鏍囪瘑
// null, // 鎺掑簭
@@ -411,4 +423,24 @@
}
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields;
+
+ @JsonAnyGetter
+ public Map<String,Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public void syncField(List<MatFieldValue> list) {
+ Map<String, Object> dynamicFields = new HashMap<>();
+ for (MatFieldValue fieldValue : list) {
+ dynamicFields.put(fieldValue.getName(), fieldValue.getValue());
+ }
+ this.dynamicFields = dynamicFields;
+ }
+
+ public String getFieldString(String key) {
+ return dynamicFields.get(key).toString();
+ }
+
}
--
Gitblit v1.9.1