From 158ef0f443b9f36f8beb44853ed1f39449c45c1d Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 10:55:37 +0800
Subject: [PATCH] #修改 1. 动态扩展字段优化 2. 物料优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 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 7e6e58b..c697ea4 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,11 +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;
@@ -22,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 {
 
@@ -56,11 +58,26 @@
     @ApiModelProperty(value= "璐т富ID")
     private Long shipperId;
 
+//    @ApiModelProperty(value = "璐т富缂栫爜")
+//    private String shipperCode;
+
     /**
      * 鍒嗙粍ID(*)
      */
     @ApiModelProperty(value= "鍒嗙粍ID(*)")
     private Long groupId;
+
+    /**
+     * 瀛楁鏍囪瘑
+     */
+    @ApiModelProperty(value = "瀛楁鏍囪瘑")
+    private String fieldsIndex;
+
+    /**
+     * 鍒嗙粍鍔╄鐮�
+     */
+    @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+    private String groupCode;
 
     /**
      * 瑙勫垯浠ｇ爜
@@ -72,7 +89,7 @@
      * ERP缂栫爜
      */
     @ApiModelProperty(value= "ERP缂栫爜")
-    private String erpCode;
+    private String platCode;
 
     /**
      * 瑙勬牸
@@ -207,6 +224,10 @@
     @TableLogic
     private Integer deleted;
 
+    @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
     /**
      * 绉熸埛
      */
@@ -254,13 +275,13 @@
 
     public Matnr() {}
 
-    public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String platCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.name = name;
         this.code = code;
         this.shipperId = shipperId;
         this.groupId = groupId;
         this.rglarId = rglarId;
-        this.erpCode = erpCode;
+        this.platCode = platCode;
         this.spec = spec;
         this.model = model;
         this.weight = weight;
@@ -327,10 +348,10 @@
 //    );
 
     public String getShipperId$(){
-        ShipperService service = SpringUtils.getBean(ShipperService.class);
-        Shipper shipper = service.getById(this.shipperId);
-        if (!Cools.isEmpty(shipper)){
-            return String.valueOf(shipper.getName());
+        CompanysService service = SpringUtils.getBean(CompanysService.class);
+        Companys companys = service.getById(this.shipperId);
+        if (!Cools.isEmpty(companys)){
+            return String.valueOf(companys.getName());
         }
         return null;
     }
@@ -344,7 +365,7 @@
         return null;
     }
 
-    public String getRglarId(){
+    public String getRglarId$(){
         BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
         BatchRegular batchRegular = service.getById(this.rglarId);
         if (!Cools.isEmpty(batchRegular)){
@@ -367,7 +388,7 @@
         }
     }
 
-    public String getIsLabelMange$(){
+    public String getFlagLabelMange$(){
         if (null == this.flagLabelMange){ return null; }
         switch (this.flagLabelMange){
             case 0:

--
Gitblit v1.9.1