From 8b2fbb38c76c670c1db5e4d2ac3d874503cbe5e2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 15:03:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/Mat.java | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 24494d3..1ce8414 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
@@ -55,93 +56,109 @@
private Long tagId;
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ExcelProperty(value = "鍗曟嵁鍙�")
private String matnr;
+
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡鍙�")
private String maktx;
/**
- * 鍒悕
+ * 绉诲姩绫诲瀷
*/
- @ApiModelProperty(value= "鍒悕")
+ @ApiModelProperty(value= "绉诲姩绫诲瀷")
+ @ExcelProperty(value = "绉诲姩绫诲瀷")
private String name;
/**
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸")
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
+ @ExcelProperty(value = "鎵规")
private String model;
/**
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
+ @ExcelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
+ @ExcelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
+ @ExcelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
@ApiModelProperty(value= "sku")
+ @ExcelProperty(value = "sku")
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
+ @ExcelProperty(value = "鍖呮暟")
private Double units;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
+ @ExcelProperty(value = "鏉＄爜")
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @ExcelProperty(value = "鐗╂枡鐘舵��")
private String origin;
/**
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
+ @ExcelProperty(value = "鍘傚")
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
@@ -149,6 +166,7 @@
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ @ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
@@ -156,6 +174,7 @@
* 瀹夊叏搴撳瓨閲�
*/
@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
@@ -163,24 +182,28 @@
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
+ @ExcelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
+ @ExcelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
@ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ExcelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
@@ -188,12 +211,14 @@
* 渚涘簲鍟�
*/
@ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
@@ -209,6 +234,7 @@
*/
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
+ @ExcelProperty(value = "淇濊川鏈�")
private String deadTime;
/**
@@ -216,6 +242,7 @@
*/
@ApiModelProperty(value= "棰勮澶╂暟")
@TableField("dead_warn")
+ @ExcelProperty(value = "棰勮澶╂暟")
private Integer deadWarn;
/**
@@ -228,7 +255,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -276,11 +303,12 @@
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty(value = "澶囨敞")
private String memo;
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 check,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) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -310,7 +338,7 @@
this.deadTime = deadTime;
this.deadWarn = deadWarn;
this.source = source;
- this.check = check;
+ this.inspect = inspect;
this.danger = danger;
this.status = status;
this.createBy = createBy;
@@ -323,21 +351,21 @@
// 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, // 閲嶉噺
@@ -395,15 +423,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
--
Gitblit v1.9.1