From ccc693f973698fc6b0d333ccab8068114c53921b Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 28 十月 2022 16:44:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/Mat.java |   67 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 8a14362..aae5257 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -151,7 +151,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -255,7 +255,7 @@
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
@@ -306,9 +306,25 @@
     @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() {}
 
-    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;
@@ -338,7 +354,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;
@@ -423,15 +439,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);
         }
     }
 
@@ -492,4 +508,39 @@
     }
 
 
+    public String getStoreMax$(){
+        if (Cools.isEmpty(this.storeMax)) {
+            return "鏈缃�";
+        }else {
+            return this.storeMax + "";
+        }
+    }
+
+    public String getStoreMin$(){
+        if (Cools.isEmpty(this.storeMin)) {
+            return "鏈缃�";
+        }else {
+            return this.storeMin + "";
+        }
+    }
+
+    public String getStoreMaxDate$(){
+        if (Cools.isEmpty(this.storeMaxDate)) {
+            return "鏈缃�";
+        }else {
+            return this.storeMaxDate + "澶�";
+        }
+    }
+
+    public String getInoutEveryday$(){
+        if (this.inoutEveryday == null){
+            return "鍚�";
+        }
+        if (this.inoutEveryday){
+            return "鏄�";
+        }else {
+            return "鍚�";
+        }
+    }
+
 }

--
Gitblit v1.9.1