From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 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 d127f14..44cd0d1 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,14 @@
 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 com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
@@ -24,7 +26,6 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 @Data
 @TableName("man_matnr")
@@ -44,19 +45,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 = "璐т富缂栫爜")
@@ -65,8 +66,14 @@
     /**
      * 鍒嗙粍ID(*)
      */
-    @ApiModelProperty(value= "鍒嗙粍ID(*)")
+    @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
     private Long groupId;
+
+    /**
+     * 瀛楁鏍囪瘑
+     */
+    @ApiModelProperty(value = "瀛楁鏍囪瘑")
+    private String fieldsIndex;
 
     /**
      * 鍒嗙粍鍔╄鐮�
@@ -77,7 +84,7 @@
     /**
      * 瑙勫垯浠ｇ爜
      */
-    @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+    @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
     private Long rglarId;
 
     /**
@@ -113,7 +120,7 @@
     /**
      * 闀�*瀹�*楂�(m)
      */
-    @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+    @ApiModelProperty(value= "灏哄(m)")
     private String size;
 
     /**
@@ -218,6 +225,10 @@
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
     @TableLogic
     private Integer deleted;
+
+    @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
 
     /**
      * 绉熸埛
@@ -351,19 +362,18 @@
         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;
     }
-
-    public String getRglarId$(){
-        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
-        BatchRegular batchRegular = service.getById(this.rglarId);
-        if (!Cools.isEmpty(batchRegular)){
-            return String.valueOf(batchRegular.getCode());
-        }
-        return null;
-    }
+//    public String getRglarId$(){
+//        SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
+//        SerialRule batchRegular = service.getById(this.rglarId);
+//        if (!Cools.isEmpty(batchRegular)){
+//            return String.valueOf(batchRegular.getCode());
+//        }
+//        return null;
+//    }
 
     public String getStockLeval$(){
         if (null == this.stockLevel){ return null; }
@@ -379,7 +389,7 @@
         }
     }
 
-    public String getIsLabelMange$(){
+    public String getFlagLabelMange$(){
         if (null == this.flagLabelMange){ return null; }
         switch (this.flagLabelMange){
             case 0:

--
Gitblit v1.9.1