From 5807fc22aba974b4ca85a8049ecd983673b0ca28 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 20 十月 2025 16:59:34 +0800
Subject: [PATCH] 1. 添加大屏接口 2. 任务站点确认修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 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 9904ef6..3c3945e 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
@@ -1,17 +1,15 @@
package com.vincent.rsf.server.manager.entity.excel;
-import cn.afterturn.easypoi.excel.annotation.Excel;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
+import cn.afterturn.easypoi.excel.annotation.Excel;
import javax.validation.constraints.NotNull;
-import java.io.Serializable;
+import lombok.experimental.Accessors;
+import lombok.Data;
+
/**
+ *
* @author Ryan
* @version 1.0
* @title MatnrsTemplate
@@ -19,32 +17,50 @@
* @create 2025/3/3 08:40
*/
@Data
+@ExcelAutoColumnSize
+@Accessors(chain = true)
public class MatnrsTemplate {
@NotNull
- @Excel(name = "鐗╂枡鍚嶇О")
+ @Excel(name = "鐗╂枡鍚嶇О*")
@ExcelComment(example = "鍗庝负鎵嬫満")
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 String shipperId;
+
@NotNull
- @Excel(name = "鍒嗙被鍚嶇О")
- @ExcelComment(example = "绉诲姩璁惧")
- private String groupName;
+ @Excel(name = "鐗╂枡鍒嗙粍")
+ @ExcelComment(example = "鎵嬫満")
+ private String groupId;
- @NotNull
- @Excel(name = "鐗╂枡鍔╄鐮�")
- @ExcelComment(example = "P3528461569")
- private String erpCode;
+
+ @Excel(name = "ERP缂栫爜")
+ @ExcelComment(example = "erp001")
+ private String platCode;
@NotNull
@Excel(name = "瑙勬牸")
@ExcelComment(example = "HW-148*68*10")
private String spec;
+
+ @NotNull
+ @Excel(name = "鍒嗙被鍚嶇О*")
+ @ExcelComment(example = "绉诲姩璁惧")
+ private String groupName;
+
+ @NotNull
+ @Excel(name = "鐗╂枡鍔╄鐮�*")
+ @ExcelComment(example = "P3528461569")
+ private String erpCode;
@NotNull
@Excel(name = "鍨嬪彿")
@@ -59,7 +75,7 @@
@ExcelComment(notNull = false, example = "绱孩鑹�")
private String color;
- @Excel(name = "澶у皬")
+ @Excel(name = "灏哄")
@ExcelComment(notNull = false, example = "148*68*10")
private String size;
@@ -67,18 +83,27 @@
@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;
@Excel(name = "閲囪喘鍗曚綅")
@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")
@@ -116,6 +141,5 @@
@Excel(name = "鏄惁鍏嶆")
@ExcelComment(notNull = false, example = "0")
private String flagCheck;
-
}
--
Gitblit v1.9.1