From d1480e6c40cbcaf7e0dd6349153a461a3635bee3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 09:04:39 +0800
Subject: [PATCH] #优化

---
 src/main/java/com/zy/asrs/entity/Mat.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 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..b37f282 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,15 +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() {}
 
@@ -504,7 +532,7 @@
 
     public String getStoreMax$(){
         if (Cools.isEmpty(this.storeMax)) {
-            return "鏈缃�";
+            return "";
         }else {
             return this.storeMax + "";
         }
@@ -512,7 +540,7 @@
 
     public String getStoreMin$(){
         if (Cools.isEmpty(this.storeMin)) {
-            return "鏈缃�";
+            return "";
         }else {
             return this.storeMin + "";
         }
@@ -520,9 +548,36 @@
 
     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 "鍚�";
+        }
+    }
+
+    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