From a74c3785d62ca46027031e2431ed8c39373f313d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 四月 2024 15:59:50 +0800
Subject: [PATCH] 修复相同目标位任务管控bug 更改 订单出库时可修改数量

---
 src/main/java/com/zy/asrs/entity/Mat.java |   24 ++++++++++++------------
 1 files changed, 12 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 84cf369..7ea8f7a 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -58,8 +58,8 @@
     /**
      * 鐗╂枡鍙�
      */
-    @ApiModelProperty(value= "鐗╂枡鍙�")
-    @ExcelProperty(value = "鐗╂枡鍙�")
+    @ApiModelProperty(value= "瀛樿揣缂栫爜")
+    @ExcelProperty(value = "瀛樿揣缂栫爜")
     private String matnr;
 
 
@@ -67,14 +67,14 @@
      * 鐗╂枡鍙�
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    @ExcelProperty(value = "鐗╂枡鍚嶇О")
+    @ExcelProperty(value = "瀛樿揣鍚嶇О")
     private String maktx;
 
     /**
      * 绉诲姩绫诲瀷
      */
-    @ApiModelProperty(value= "绉诲姩绫诲瀷")
-    //@ExcelProperty(value = "绉诲姩绫诲瀷")
+    @ApiModelProperty(value= "鐢熶骇閮ㄩ棬鍚嶇О")
+    @ExcelProperty(value = "鐢熶骇閮ㄩ棬鍚嶇О")
     private String name;
 
     /**
@@ -95,28 +95,28 @@
      * 棰滆壊
      */
     @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;
 
     /**
@@ -130,7 +130,7 @@
      * 鍖呮暟
      */
     @ApiModelProperty(value= "鍖呮暟")
-    @ExcelProperty(value = "閿�椤圭◣")
+    @ExcelProperty(value = "閿�椤圭◣鐜�%")
     private Double units;
 
     /**
@@ -144,7 +144,7 @@
      * 鐗╂枡鐘舵��
      */
     @ApiModelProperty(value= "鐗╂枡鐘舵��")
-    //@ExcelProperty(value = "鐗╂枡鐘舵��")
+    @ExcelProperty(value = "鏄惁鎵规绠＄悊")
     private String origin;
 
     /**
@@ -227,7 +227,7 @@
      */
     @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     @TableField("be_batch")
-    @ExcelProperty(value = "鐗╂枡棰戠巼")
+    //@ExcelProperty(value = "'鏄惁鎵规绠＄悊")
     private Integer beBatch;
 
     /**

--
Gitblit v1.9.1