From f1b97dcec8e07a5c72d240114b3908b8df5b1e44 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 13 十月 2023 10:25:12 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/entity/Mat.java | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 0a02150..9bd9f90 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,25 +56,25 @@
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;
/**
- * 鍒悕
+ * 绉诲姩绫诲瀷
*/
- @ApiModelProperty(value= "鍒悕")
- @ExcelProperty(value = "鍒悕")
+ @ApiModelProperty(value= "绉诲姩绫诲瀷")
+ @ExcelProperty(value = "绉诲姩绫诲瀷")
private String name;
/**
@@ -85,10 +85,10 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
- @ExcelProperty(value = "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
+ @ExcelProperty(value = "鎵规")
private String model;
/**
@@ -127,10 +127,10 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
- @ExcelProperty(value = "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
+ @ExcelProperty(value = "鍖呮暟")
private Double units;
/**
@@ -141,24 +141,24 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
- @ExcelProperty(value = "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @ExcelProperty(value = "鐗╂枡鐘舵��")
private String origin;
/**
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
- @ExcelProperty(value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍘傚")
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- @ExcelProperty(value = "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
@@ -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,26 +372,29 @@
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, // 鐗╂枡鍙�
+// null, // 绉诲姩绫诲瀷
// null, // 瑙勬牸
-// null, // 鍨嬪彿
+// null, // 鎵规
// null, // 棰滆壊
// null, // 鍝佺墝
// null, // 鍗曚綅
// null, // 鍗曚环
// null, // sku
-// null, // 鍗曚綅閲�
+// null, // 鍖呮暟
// null, // 鏉＄爜
-// null, // 浜у湴
+// null, // 鐗╂枡鐘舵��
// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
+// null, // 鍗曟嵁鏃堕棿
// null, // 鍝侀」鏁�
// null, // 瀹夊叏搴撳瓨閲�
// null, // 閲嶉噺
--
Gitblit v1.9.1