From 36848f23ba7f635ef9477866d783eb319dd3a3f9 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 01 四月 2025 15:34:34 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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..3978f0c 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 {
@@ -65,6 +66,18 @@
*/
@ApiModelProperty(value= "鍒嗙粍ID(*)")
private Long groupId;
+
+ /**
+ * 瀛楁鏍囪瘑
+ */
+ @ApiModelProperty(value = "瀛楁鏍囪瘑")
+ private String fieldsIndex;
+
+ /**
+ * 鍒嗙粍鍔╄鐮�
+ */
+ @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+ private String groupCode;
/**
* 瑙勫垯浠ｇ爜
@@ -211,6 +224,10 @@
@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