From 0bedfead3ffe6d2251d7428d772de0a4df6b5201 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 21 七月 2025 15:52:49 +0800
Subject: [PATCH] 1.向mes查询物料 2.入库上报mes

---
 src/main/java/com/zy/asrs/entity/Mat.java |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 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..a6ab9a3 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;
@@ -87,15 +88,15 @@
     /**
      * 鍨嬪彿
      */
-    @ApiModelProperty(value= "鍨嬪彿")
-    @ExcelProperty(value = "鍨嬪彿")
+    @ApiModelProperty(value= "鍒跺崟浜�")
+    @ExcelProperty(value = "鍒跺崟浜�")
     private String model;
 
     /**
      * 棰滆壊
      */
-    @ApiModelProperty(value= "棰滆壊")
-    @ExcelProperty(value = "棰滆壊")
+    @ApiModelProperty(value= "鐘舵��")
+    @ExcelProperty(value = "鐘舵��")
     private String color;
 
     /**
@@ -115,15 +116,15 @@
     /**
      * 鍗曚环
      */
-    @ApiModelProperty(value= "鍗曚环")
-    @ExcelProperty(value = "鍗曚环")
+    @ApiModelProperty(value= "鐢熶骇鏁伴噺")
+    @ExcelProperty(value = "鐢熶骇鏁伴噺")
     private Double price;
 
     /**
      * sku
      */
-    @ApiModelProperty(value= "sku")
-    @ExcelProperty(value = "sku")
+    @ApiModelProperty(value= "鐢熶骇鎵瑰彿")
+    @ExcelProperty(value = "鐢熶骇鎵瑰彿")
     private String sku;
 
     /**
@@ -143,15 +144,15 @@
     /**
      * 浜у湴
      */
-    @ApiModelProperty(value= "浜у湴")
-    @ExcelProperty(value = "浜у湴")
+    @ApiModelProperty(value= "鑳堕噺")
+    @ExcelProperty(value = "鑳堕噺")
     private String origin;
 
     /**
      * 鍘傚
      */
-    @ApiModelProperty(value= "鍘傚")
-    @ExcelProperty(value = "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "璐ㄩ噺鐘舵��")
+    @ExcelProperty(value = "璐ㄩ噺鐘舵��")
     private String manu;
 
     /**
@@ -305,6 +306,24 @@
     @ApiModelProperty(value= "澶囨敞")
     @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() {}
 
@@ -491,5 +510,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