From f66fd8ba90a75a2002ba7783a870035e7908d89f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 27 十二月 2024 09:21:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/Mat.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bb98001..f666131 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -189,8 +190,8 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- @ExcelProperty(value = "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
@@ -306,9 +307,27 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
public Mat() {}
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -329,7 +348,7 @@
this.itemNum = itemNum;
this.safeQty = safeQty;
this.weight = weight;
- this.length = length;
+ this.manLength = manLength;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
@@ -491,5 +510,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1