From 383c6139926563f02fba4432effbfc27f87d88c5 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期三, 30 七月 2025 14:36:57 +0800
Subject: [PATCH] ERP对接

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

diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 420a5f5..b37f282 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -59,8 +59,15 @@
      * 鍟嗗搧缂栧彿
      */
     @ApiModelProperty(value= "鍟嗗搧缂栧彿")
-    @ExcelProperty(value = "鍟嗗搧缂栫爜")
+    @ExcelProperty(value = "鍟嗗搧缂栧彿")
     private String matnr;
+
+    /**
+     * 鍟嗗搧缂栧彿
+     */
+    @ApiModelProperty(value= "鏂板晢鍝佺紪鍙�")
+    @ExcelProperty(value = "鏂板晢鍝佺紪鍙�")
+    private String matnrNew;
 
 
     /**
@@ -330,6 +337,12 @@
     @TableField("inout_everyday")
     private Boolean inoutEveryday;
 
+    /**
+     * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+     */
+    @ApiModelProperty(value= "涓婃灦鍖哄煙")
+    @TableField("mat_type")
+    private Integer matType;
 
     public Mat() {}
 
@@ -552,4 +565,20 @@
         }
     }
 
+    public String getMatType$() {
+        if (this.matType == null) {
+            return "";
+        }
+        switch (this.matType) {
+            case 1:
+                return "鍗曞搧鍖�";
+            case 2:
+                return "楂橀娣锋斁鍖�";
+            case 3:
+                return "浣庨娣锋斁鍖�";
+            default:
+                return "";
+        }
+    }
+
 }

--
Gitblit v1.9.1