From ae674442480bf1126dbfa430b246cd9a706666cc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 28 四月 2023 13:11:06 +0800
Subject: [PATCH] 商品档案数据导出和新商品编号同步
---
src/main/java/com/zy/asrs/entity/Mat.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 95beb7b..0e6d939 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,14 +313,29 @@
@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;
public Mat() {}
@@ -504,7 +526,7 @@
public String getStoreMax$(){
if (Cools.isEmpty(this.storeMax)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMax + "";
}
@@ -512,7 +534,7 @@
public String getStoreMin$(){
if (Cools.isEmpty(this.storeMin)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMin + "";
}
@@ -520,9 +542,20 @@
public String getStoreMaxDate$(){
if (Cools.isEmpty(this.storeMaxDate)) {
- return "鏈缃�";
+ return "";
}else {
- return this.storeMaxDate + "澶�";
+ return this.storeMaxDate + "";
+ }
+ }
+
+ public String getInoutEveryday$(){
+ if (this.inoutEveryday == null){
+ return "鍚�";
+ }
+ if (this.inoutEveryday){
+ return "鏄�";
+ }else {
+ return "鍚�";
}
}
--
Gitblit v1.9.1