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/excel/MatnrsTemplate.java | 48 +++++++++++++++++++++++++++++++++++++-----------
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 12 ++++++------
2 files changed, 43 insertions(+), 17 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 3978f0c..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
@@ -43,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 = "璐т富缂栫爜")
@@ -64,7 +64,7 @@
/**
* 鍒嗙粍ID(*)
*/
- @ApiModelProperty(value= "鍒嗙粍ID(*)")
+ @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
private Long groupId;
/**
@@ -82,7 +82,7 @@
/**
* 瑙勫垯浠ｇ爜
*/
- @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+ @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
private Long rglarId;
/**
@@ -118,7 +118,7 @@
/**
* 闀�*瀹�*楂�(m)
*/
- @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+ @ApiModelProperty(value= "灏哄(m)")
private String size;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
index cb9e44e..cebc41b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
@@ -27,9 +27,31 @@
private String name;
@NotNull
- @Excel(name = "鍒嗙被鍔╄鐮�*")
- @ExcelComment(example = "256874556")
- private String groupCode;
+ @Excel(name = "鐗╂枡缂栫爜*")
+ @ExcelComment(example = "matnr123")
+ private String code;
+
+
+ @Excel(name = "璐т富鏍囪瘑")
+ @ExcelComment(example = "123")
+ private Long shipperId;
+
+
+
+ @NotNull
+ @Excel(name = "鐗╂枡鍒嗙粍")
+ @ExcelComment(example = "鎵嬫満")
+ private Long groupId;
+
+
+ @Excel(name = "ERP缂栫爜")
+ @ExcelComment(example = "erp001")
+ private String platCode;
+
+ @NotNull
+ @Excel(name = "瑙勬牸")
+ @ExcelComment(example = "HW-148*68*10")
+ private String spec;
@NotNull
@Excel(name = "鍒嗙被鍚嶇О*")
@@ -40,11 +62,6 @@
@Excel(name = "鐗╂枡鍔╄鐮�*")
@ExcelComment(example = "P3528461569")
private String erpCode;
-
- @NotNull
- @Excel(name = "瑙勬牸")
- @ExcelComment(example = "HW-148*68*10")
- private String spec;
@NotNull
@Excel(name = "鍨嬪彿")
@@ -59,7 +76,7 @@
@ExcelComment(notNull = false, example = "绱孩鑹�")
private String color;
- @Excel(name = "澶у皬")
+ @Excel(name = "灏哄")
@ExcelComment(notNull = false, example = "148*68*10")
private String size;
@@ -67,12 +84,12 @@
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String describle;
- @Excel(name = "鎻忚堪")
+ @Excel(name = "鏍囧寘鏁伴噺")
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String nromNum;
@NotNull
- @Excel(name = "涓诲崟浣�")
+ @Excel(name = "鍗曚綅")
@ExcelComment(example = "閮�")
private String unit;
@@ -80,6 +97,15 @@
@ExcelComment(example = "閮�")
private String purUnit;
+ @Excel(name = "搴撲綅鍗曚綅")
+ @ExcelComment(example = "閮�")
+ private String stockUnit;
+
+ @NotNull
+ @Excel(name = "鍒嗙被鍔╄鐮�*")
+ @ExcelComment(example = "256874556")
+ private String groupCode;
+
@Excel(name = "ABC绫�")
@ExcelComment(notNull = false, example = "0")
private String stockLevel;
--
Gitblit v1.9.1