From 3af3b194265d37e40c8d141155bdc872781d8729 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:11 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/entity/Mat.java |   45 ++++++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 6efecb1..234d4b7 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,6 +56,7 @@
      */
     @ApiModelProperty(value= "鎵�灞炲綊绫�")
     @TableField("tag_id")
+//    @ExcelProperty(value = "鍟嗗搧绫诲瀷")
     private Long tagId;
 
     /**
@@ -77,35 +78,35 @@
      * 鍒悕
      */
     @ApiModelProperty(value= "鍒悕")
-    @ExcelProperty(value = "鍒悕")
+//    @ExcelProperty(value = "鍒悕")
     private String name;
 
     /**
      * 瑙勬牸
      */
     @ApiModelProperty(value= "瑙勬牸")
-    @ExcelProperty(value = "瑙勬牸")
+    @ExcelProperty(value = "灏哄")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
     @ApiModelProperty(value= "鍨嬪彿")
-    @ExcelProperty(value = "鍨嬪彿")
+//    @ExcelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
      * 棰滆壊
      */
     @ApiModelProperty(value= "棰滆壊")
-    @ExcelProperty(value = "棰滆壊")
+//    @ExcelProperty(value = "棰滆壊")
     private String color;
 
     /**
      * 鍝佺墝
      */
     @ApiModelProperty(value= "鍝佺墝")
-    @ExcelProperty(value = "鍝佺墝")
+//    @ExcelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
@@ -119,42 +120,42 @@
      * 鍗曚环
      */
     @ApiModelProperty(value= "鍗曚环")
-    @ExcelProperty(value = "鍗曚环")
+//    @ExcelProperty(value = "鍗曚环")
     private Double price;
 
     /**
      * sku
      */
     @ApiModelProperty(value= "sku")
-    @ExcelProperty(value = "sku")
+//    @ExcelProperty(value = "sku")
     private String sku;
 
     /**
      * 鍗曚綅閲�
      */
     @ApiModelProperty(value= "鍗曚綅閲�")
-    @ExcelProperty(value = "鍗曚綅閲�")
+//    @ExcelProperty(value = "鍗曚綅閲�")
     private Double units;
 
     /**
      * 鏉＄爜
      */
     @ApiModelProperty(value= "鏉＄爜")
-    @ExcelProperty(value = "鏉＄爜")
+//    @ExcelProperty(value = "鏉＄爜")
     private String barcode;
 
     /**
      * 浜у湴
      */
     @ApiModelProperty(value= "浜у湴")
-    @ExcelProperty(value = "浜у湴")
+//    @ExcelProperty(value = "浜у湴")
     private String origin;
 
     /**
      * 鍘傚
      */
     @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍘傚")
+    @ExcelProperty(value = "鍏徃")
     private String manu;
 
     /**
@@ -169,7 +170,7 @@
      * 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
      */
     @ApiModelProperty(value= "鍝侀」鏁�")
-    @ExcelProperty(value = "鍝侀」鏁�")
+//    @ExcelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
@@ -177,7 +178,7 @@
      * 瀹夊叏搴撳瓨閲�
      */
     @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
-    @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+//    @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
     @TableField("safe_qty")
     private Double safeQty;
 
@@ -204,14 +205,14 @@
      * 浣撶Н
      */
     @ApiModelProperty(value= "浣撶Н")
-    @ExcelProperty(value = "浣撶Н")
+//    @ExcelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
     @ApiModelProperty(value= "涓夋柟缂栫爜")
-    @ExcelProperty(value = "涓夋柟缂栫爜")
+    @ExcelProperty(value = "BS Code")
     @TableField("three_code")
     private String threeCode;
 
@@ -219,7 +220,7 @@
      * 渚涘簲鍟�
      */
     @ApiModelProperty(value= "渚涘簲鍟�")
-    @ExcelProperty(value = "渚涘簲鍟�")
+//    @ExcelProperty(value = "渚涘簲鍟�")
     private String supp;
 
     /**
@@ -242,7 +243,7 @@
      */
     @ApiModelProperty(value= "淇濊川鏈�")
     @TableField("dead_time")
-    @ExcelProperty(value = "淇濊川鏈�")
+//    @ExcelProperty(value = "淇濊川鏈�")
     private String deadTime;
 
     /**
@@ -250,7 +251,7 @@
      */
     @ApiModelProperty(value= "棰勮澶╂暟")
     @TableField("dead_warn")
-    @ExcelProperty(value = "棰勮澶╂暟")
+//    @ExcelProperty(value = "棰勮澶╂暟")
     private Integer deadWarn;
 
     /**
@@ -310,7 +311,7 @@
 
     @ApiModelProperty("搴撲綅绫诲瀷")
     @TableField("loc_type")
-    @ExcelProperty(value = "搴撲綅绫诲瀷")
+//    @ExcelProperty(value = "搴撲綅绫诲瀷")
     private Long locType;
 
     /**
@@ -338,6 +339,12 @@
     @TableField("store_max_date")
     private Integer storeMaxDate;
 
+    /**
+     * 鍑哄簱浼樺厛绾�
+     */
+    @TableField("group_proty")
+    private Integer groupProty;
+
     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 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) {

--
Gitblit v1.9.1