From 731ccdc2b431ca176942daa1bdb0e752ac9bd4f5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 九月 2024 10:40:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/Mat.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 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..7a187c2 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.TagService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -151,7 +152,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -255,7 +256,7 @@
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
@@ -306,9 +307,22 @@
     @ExcelProperty(value = "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("inventory_max")
+    private Integer inventoryMax;
+
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("inventory_min")
+    private Integer inventoryMin;
+
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("inventory_age_max")
+    private Integer inventoryAgeMax;
+
+
     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,Integer inventoryMin,Integer inventoryMax,Integer inventoryAgeMax) {
         this.uuid = uuid;
         this.tagId = tagId;
         this.matnr = matnr;
@@ -338,7 +352,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;
@@ -346,6 +360,9 @@
         this.updateBy = updateBy;
         this.updateTime = updateTime;
         this.memo = memo;
+        this.inventoryAgeMax = inventoryAgeMax;
+        this.inventoryMax = inventoryMax;
+        this.inventoryMin = inventoryMin;
     }
 
 //    Mat mat = new Mat(
@@ -423,15 +440,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);
         }
     }
 
@@ -491,5 +508,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 
 }

--
Gitblit v1.9.1