From cbb0dfaec496d441bbf4287ca8ae85c2776e50ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:12:39 +0800
Subject: [PATCH] #修改 1. 收货通知单明细模板修改 2. 收货通知单添加动态扩展字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 99d544c..d127f14 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
@@ -9,6 +9,7 @@
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;
@@ -27,6 +28,7 @@
@Data
@TableName("man_matnr")
+@Accessors(chain = true)
@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
@@ -57,11 +59,20 @@
@ApiModelProperty(value= "璐т富ID")
private Long shipperId;
+// @ApiModelProperty(value = "璐т富缂栫爜")
+// private String shipperCode;
+
/**
* 鍒嗙粍ID(*)
*/
@ApiModelProperty(value= "鍒嗙粍ID(*)")
private Long groupId;
+
+ /**
+ * 鍒嗙粍鍔╄鐮�
+ */
+ @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+ private String groupCode;
/**
* 瑙勫垯浠ｇ爜
@@ -73,7 +84,7 @@
* ERP缂栫爜
*/
@ApiModelProperty(value= "ERP缂栫爜")
- private String erpCode;
+ private String platCode;
/**
* 瑙勬牸
@@ -255,13 +266,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;
--
Gitblit v1.9.1