From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +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/excel/MatnrsTemplate.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
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