From a57445f55e84b7cf6bd26cf152a0ffa7f62f54f2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 25 九月 2025 20:06:59 +0800
Subject: [PATCH] 添加容器管理 商品档案管理

---
 src/main/java/com/zy/asrs/entity/Mat.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 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 0a02150..bdd9654 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,7 +7,10 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.enums.ContainerType;
+import com.zy.asrs.service.BasContainerService;
 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 +154,7 @@
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty(value = "鍘傚")
     private String manu;
 
     /**
@@ -163,7 +166,7 @@
     private String manuDate;
 
     /**
-     * 鍝侀」鏁�
+     * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
      */
     @ApiModelProperty(value= "鍝侀」鏁�")
     @ExcelProperty(value = "鍝侀」鏁�")
@@ -185,12 +188,17 @@
     @ExcelProperty(value = "閲嶉噺")
     private Double weight;
 
+    @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+    @ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
+    @TableField("up_qty")
+    private Double upQty;
+
     /**
      * 闀垮害
      */
     @ApiModelProperty(value= "闀垮害")
-    @ExcelProperty(value = "闀垮害")
-    private Double length;
+    @TableField("man_length")
+    private Double manLength;
 
     /**
      * 浣撶Н
@@ -299,6 +307,10 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @ApiModelProperty("搴撲綅绫诲瀷")
+    @TableField("loc_type")
+    private Long locType;
+
     /**
      * 澶囨敞
      */
@@ -306,9 +318,27 @@
     @ExcelProperty(value = "澶囨敞")
     private String memo;
 
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓婇檺
+     */
+    @TableField("store_max")
+    private Double storeMax;
+
+    /**
+     * 搴撳瓨棰勮鏁伴噺涓嬮檺
+     */
+    @TableField("store_min")
+    private Double storeMin;
+
+    /**
+     * 搴撻緞棰勮涓婇檺
+     */
+    @TableField("store_max_date")
+    private Integer storeMaxDate;
+
     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 inspect,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 manLength,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;
@@ -329,7 +359,7 @@
         this.itemNum = itemNum;
         this.safeQty = safeQty;
         this.weight = weight;
-        this.length = length;
+        this.manLength = manLength;
         this.volume = volume;
         this.threeCode = threeCode;
         this.supp = supp;
@@ -393,6 +423,20 @@
         Tag tag = service.selectById(this.tagId);
         if (!Cools.isEmpty(tag)){
             return String.valueOf(tag.getName());
+        }
+        return null;
+    }
+
+    public String getLocType$(){
+        if (Cools.isEmpty(locType)) {
+            return "鏂欑";
+        }
+        if (locType.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+            return ContainerType.CONTAINER_TYPE_BOX.desc;
+        } else if (locType.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+            return ContainerType.CONTAINER_TYPE_SALVER.desc;
+        } else if (locType.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+            return ContainerType.CONTAINER_TYPE_CAGE.desc;
         }
         return null;
     }
@@ -491,5 +535,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