From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/Mat.java | 130 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 49 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..7ea8f7a 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,109 +56,109 @@
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;
/**
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty(value = "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸鍨嬪彿")
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
- @ExcelProperty(value = "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
+ @ExcelProperty(value = "閫氱敤鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
- @ExcelProperty(value = "棰滆壊")
+ @ExcelProperty(value = "鏄惁鍐呴攢")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
- @ExcelProperty(value = "鍝佺墝")
+ @ExcelProperty(value = "瀛樿揣澶х被鍚嶇О")
private String brand;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- @ExcelProperty(value = "鍗曚綅")
+ @ExcelProperty(value = "涓昏閲忓崟浣嶅悕绉�")
private String unit;
/**
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
- @ExcelProperty(value = "鍗曚环")
+ @ExcelProperty(value = "杩涢」绋庣巼%")
private Double price;
/**
* sku
*/
@ApiModelProperty(value= "sku")
- @ExcelProperty(value = "sku")
+ //@ExcelProperty(value = "sku")
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
- @ExcelProperty(value = "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
+ @ExcelProperty(value = "閿�椤圭◣鐜�%")
private Double units;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
- @ExcelProperty(value = "鏉＄爜")
+ //@ExcelProperty(value = "鏉＄爜")
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;
@@ -166,7 +166,7 @@
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
- @ExcelProperty(value = "鍝侀」鏁�")
+ //@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
@@ -182,28 +182,28 @@
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
- @ExcelProperty(value = "閲嶉噺")
+ //@ExcelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- @ExcelProperty(value = "闀垮害")
+ //@ExcelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "浣撶Н")
+ //@ExcelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
@ApiModelProperty(value= "涓夋柟缂栫爜")
- @ExcelProperty(value = "涓夋柟缂栫爜")
+ //@ExcelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
@@ -211,14 +211,14 @@
* 渚涘簲鍟�
*/
@ApiModelProperty(value= "渚涘簲鍟�")
- @ExcelProperty(value = "渚涘簲鍟�")
+ @ExcelProperty(value = "寤烘。浜�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ //@ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
@@ -227,6 +227,7 @@
*/
@ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
+ //@ExcelProperty(value = "'鏄惁鎵规绠＄悊")
private Integer beBatch;
/**
@@ -234,7 +235,7 @@
*/
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
- @ExcelProperty(value = "淇濊川鏈�")
+ //@ExcelProperty(value = "淇濊川鏈�")
private String deadTime;
/**
@@ -242,7 +243,7 @@
*/
@ApiModelProperty(value= "棰勮澶╂暟")
@TableField("dead_warn")
- @ExcelProperty(value = "棰勮澶╂暟")
+ //@ExcelProperty(value = "棰勮澶╂暟")
private Integer deadWarn;
/**
@@ -306,9 +307,37 @@
@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")
+ @ExcelProperty(value = "鍚敤鏃ユ湡")
+ private Date dsDate;
+
+ //寤烘。鏃ユ湡
+ @TableField("d_inv_create_datetime")
+ @ExcelProperty(value = "寤烘。鏃ユ湡")
+ 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 +375,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, // 閲嶉噺
@@ -401,11 +433,11 @@
if (null == this.beBatch){ return null; }
switch (this.beBatch){
case 1:
- return "鏄�";
+ return "楂�";
case 0:
- return "鍚�";
+ return "浣�";
default:
- return String.valueOf(this.beBatch);
+ return "浣�";
}
}
--
Gitblit v1.9.1