From a44c8916586337ea4b7e1faa0c4f622ac3e2784f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 15 四月 2025 15:42:03 +0800
Subject: [PATCH] #优化:物料表导入模版与web端不符合

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index b4af411..46c25f4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -3,12 +3,13 @@
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
 
 import com.vincent.rsf.server.manager.service.BatchRegularService;
 import com.vincent.rsf.server.manager.service.CompanysService;
 import com.vincent.rsf.server.manager.service.MatnrGroupService;
 import com.vincent.rsf.server.manager.service.ShipperService;
+import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,10 +24,10 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 @Data
 @TableName("man_matnr")
+@Accessors(chain = true)
 @ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
 public class Matnr implements Serializable {
 
@@ -42,19 +43,19 @@
     /**
      * 鍚嶇О
      */
-    @ApiModelProperty(value= "鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String name;
 
     /**
      * 缂栫爜
      */
-    @ApiModelProperty(value= "缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡缂栫爜")
     private String code;
 
     /**
      * 璐т富ID
      */
-    @ApiModelProperty(value= "璐т富ID")
+    @ApiModelProperty(value= "璐т富鏍囪瘑")
     private Long shipperId;
 
 //    @ApiModelProperty(value = "璐т富缂栫爜")
@@ -63,13 +64,25 @@
     /**
      * 鍒嗙粍ID(*)
      */
-    @ApiModelProperty(value= "鍒嗙粍ID(*)")
+    @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
     private Long groupId;
+
+    /**
+     * 瀛楁鏍囪瘑
+     */
+    @ApiModelProperty(value = "瀛楁鏍囪瘑")
+    private String fieldsIndex;
+
+    /**
+     * 鍒嗙粍鍔╄鐮�
+     */
+    @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+    private String groupCode;
 
     /**
      * 瑙勫垯浠ｇ爜
      */
-    @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+    @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
     private Long rglarId;
 
     /**
@@ -105,7 +118,7 @@
     /**
      * 闀�*瀹�*楂�(m)
      */
-    @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+    @ApiModelProperty(value= "灏哄(m)")
     private String size;
 
     /**
@@ -210,6 +223,10 @@
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
     @TableLogic
     private Integer deleted;
+
+    @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
 
     /**
      * 绉熸埛
@@ -343,7 +360,7 @@
         MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
         MatnrGroup matnrGroup = service.getById(this.groupId);
         if (!Cools.isEmpty(matnrGroup)){
-            return String.valueOf(matnrGroup.getCode());
+            return String.valueOf(matnrGroup.getName());
         }
         return null;
     }
@@ -371,7 +388,7 @@
         }
     }
 
-    public String getIsLabelMange$(){
+    public String getFlagLabelMange$(){
         if (null == this.flagLabelMange){ return null; }
         switch (this.flagLabelMange){
             case 0:

--
Gitblit v1.9.1