From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位
---
src/main/java/com/zy/asrs/entity/Mat.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index aae5257..8716473 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -59,8 +59,15 @@
* 鍟嗗搧缂栧彿
*/
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty(value = "鍟嗗搧缂栫爜")
+ @ExcelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鏂板晢鍝佺紪鍙�")
+ @ExcelProperty(value = "鏂板晢鍝佺紪鍙�")
+ private String matnrNew;
/**
@@ -306,21 +313,36 @@
@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("inout_everyday")
private Boolean inoutEveryday;
+ /**
+ * 鐗╂枡绫诲瀷{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @TableField("mat_type")
+ private Integer matType;
public Mat() {}
@@ -510,7 +532,7 @@
public String getStoreMax$(){
if (Cools.isEmpty(this.storeMax)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMax + "";
}
@@ -518,7 +540,7 @@
public String getStoreMin$(){
if (Cools.isEmpty(this.storeMin)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMin + "";
}
@@ -526,9 +548,9 @@
public String getStoreMaxDate$(){
if (Cools.isEmpty(this.storeMaxDate)) {
- return "鏈缃�";
+ return "";
}else {
- return this.storeMaxDate + "澶�";
+ return this.storeMaxDate + "";
}
}
@@ -543,4 +565,20 @@
}
}
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧鍖�";
+ case 2:
+ return "楂橀娣锋斁鍖�";
+ case 3:
+ return "浣庨娣锋斁鍖�";
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.1