From dcaa739b0c28e0ea4628a4d08e0683001ced273a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 10 十一月 2023 18:16:05 +0800
Subject: [PATCH] agv物料混载更改 新增根据物料频率查找库位

---
 src/main/java/com/zy/asrs/entity/Mat.java |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 9bd9f90..84cf369 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -74,91 +74,91 @@
      * 绉诲姩绫诲瀷
      */
     @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;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    @ExcelProperty(value = "鍗曚綅")
+    @ExcelProperty(value = "璁￠噺鍗曚綅")
     private String unit;
 
     /**
      * 鍗曚环
      */
     @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;
 
     /**
      * 鍗曟嵁鏃堕棿
      */
     @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
-    @ExcelProperty(value = "鍗曟嵁鏃堕棿")
+    //@ExcelProperty(value = "鍗曟嵁鏃堕棿")
     @TableField("manu_date")
     private String manuDate;
 
@@ -166,7 +166,7 @@
      * 鍝侀」鏁�
      */
     @ApiModelProperty(value= "鍝侀」鏁�")
-    @ExcelProperty(value = "鍝侀」鏁�")
+    //@ExcelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
@@ -182,28 +182,28 @@
      * 閲嶉噺
      */
     @ApiModelProperty(value= "閲嶉噺")
-    @ExcelProperty(value = "閲嶉噺")
+    //@ExcelProperty(value = "閲嶉噺")
     private Double weight;
 
     /**
      * 闀垮害
      */
     @ApiModelProperty(value= "闀垮害")
-    @ExcelProperty(value = "闀垮害")
+    //@ExcelProperty(value = "闀垮害")
     private Double length;
 
     /**
      * 浣撶Н
      */
     @ApiModelProperty(value= "浣撶Н")
-    @ExcelProperty(value = "浣撶Н")
+    //@ExcelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
     @ApiModelProperty(value= "涓夋柟缂栫爜")
-    @ExcelProperty(value = "涓夋柟缂栫爜")
+    //@ExcelProperty(value = "涓夋柟缂栫爜")
     @TableField("three_code")
     private String threeCode;
 
@@ -211,14 +211,14 @@
      * 渚涘簲鍟�
      */
     @ApiModelProperty(value= "渚涘簲鍟�")
-    @ExcelProperty(value = "渚涘簲鍟�")
+    @ExcelProperty(value = "寤烘。浜�")
     private String supp;
 
     /**
      * 渚涘簲鍟嗙紪鐮�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
-    @ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+    //@ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
     @TableField("supp_code")
     private String suppCode;
 
@@ -227,6 +227,7 @@
      */
     @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     @TableField("be_batch")
+    @ExcelProperty(value = "鐗╂枡棰戠巼")
     private Integer beBatch;
 
     /**
@@ -234,7 +235,7 @@
      */
     @ApiModelProperty(value= "淇濊川鏈�")
     @TableField("dead_time")
-    @ExcelProperty(value = "淇濊川鏈�")
+    //@ExcelProperty(value = "淇濊川鏈�")
     private String deadTime;
 
     /**
@@ -242,7 +243,7 @@
      */
     @ApiModelProperty(value= "棰勮澶╂暟")
     @TableField("dead_warn")
-    @ExcelProperty(value = "棰勮澶╂暟")
+    //@ExcelProperty(value = "棰勮澶╂暟")
     private Integer deadWarn;
 
     /**
@@ -326,10 +327,12 @@
 
     //鍚姩鏃ユ湡
     @TableField("ds_date")
+    @ExcelProperty(value = "鍚敤鏃ユ湡")
     private Date dsDate;
 
     //寤烘。鏃ユ湡
     @TableField("d_inv_create_datetime")
+    @ExcelProperty(value = "寤烘。鏃ユ湡")
     private Date dInvCreateDatetime;
 
     public Mat() {}
@@ -430,11 +433,11 @@
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
             case 1:
-                return "鏄�";
+                return "楂�";
             case 0:
-                return "鍚�";
+                return "浣�";
             default:
-                return String.valueOf(this.beBatch);
+                return "浣�";
         }
     }
 

--
Gitblit v1.9.1