From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/entity/Mat.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 1ce8414..9bd9f90 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,18 +56,18 @@
private Long tagId;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- @ExcelProperty(value = "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡鍙�")
private String matnr;
/**
* 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
- @ExcelProperty(value = "鐗╂枡鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ExcelProperty(value = "鐗╂枡鍚嶇О")
private String maktx;
/**
@@ -306,9 +306,35 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
+ //鍚姩鏃ユ湡
+ @TableField("ds_date")
+ private Date dsDate;
+
+ //寤烘。鏃ユ湡
+ @TableField("d_inv_create_datetime")
+ private Date dInvCreateDatetime;
+
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 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, Double storeMax, Double storeMin, Integer storeMaxDate) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -346,12 +372,15 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.storeMax = storeMax;
+ this.storeMin = storeMin;
+ this.storeMaxDate = storeMaxDate;
}
// Mat mat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
-// null, // 鍗曟嵁鍙�
+// null, // 鐗╂枡鍙�
// null, // 鐗╂枡鍙�
// null, // 绉诲姩绫诲瀷
// null, // 瑙勬牸
--
Gitblit v1.9.1