From 0345d3175861c5612e937487770a5ba4e8468b14 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 10 五月 2025 09:49:52 +0800
Subject: [PATCH] 收货单打印功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 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 688ab4d..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
@@ -8,6 +8,7 @@
import lombok.ToString;
import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@@ -18,32 +19,51 @@
* @create 2025/3/3 08:40
*/
@Data
-@ExcelAutoColumnSize
-@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatnrsTemplate implements Serializable {
+public class MatnrsTemplate {
- @Excel(name = "鐗╂枡鍚嶇О")
+ @NotNull
+ @Excel(name = "鐗╂枡鍚嶇О*")
@ExcelComment(example = "鍗庝负鎵嬫満")
private String name;
- @Excel(name = "鍒嗙被鍔╄鐮�")
- @ExcelComment(example = "256874556")
- private String groupCode;
+ @NotNull
+ @Excel(name = "鐗╂枡缂栫爜*")
+ @ExcelComment(example = "matnr123")
+ private String code;
- @Excel(name = "鍒嗙被鍚嶇О")
- @ExcelComment(example = "绉诲姩璁惧")
- private String groupName;
- @Excel(name = "鐗╂枡鍔╄鐮�")
- @ExcelComment(example = "P3528461569")
- private String erpCode;
+ @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 = "鍒嗙被鍚嶇О*")
+ @ExcelComment(example = "绉诲姩璁惧")
+ private String groupName;
+
+ @NotNull
+ @Excel(name = "鐗╂枡鍔╄鐮�*")
+ @ExcelComment(example = "P3528461569")
+ private String erpCode;
+
+ @NotNull
@Excel(name = "鍨嬪彿")
@ExcelComment(example = "鍗庝负涓夋姌鍙�")
private String model;
@@ -56,7 +76,7 @@
@ExcelComment(notNull = false, example = "绱孩鑹�")
private String color;
- @Excel(name = "澶у皬")
+ @Excel(name = "灏哄")
@ExcelComment(notNull = false, example = "148*68*10")
private String size;
@@ -64,17 +84,27 @@
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String describle;
- @Excel(name = "鎻忚堪")
+ @Excel(name = "鏍囧寘鏁伴噺")
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String nromNum;
- @Excel(name = "涓诲崟浣�")
+ @NotNull
+ @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")
@@ -88,6 +118,7 @@
@ExcelComment(notNull = false, example = "10")
private String minQty;
+ @NotNull
@Excel(name = "鏈�澶у簱瀛橀噺")
@ExcelComment(notNull = false, example = "150")
private String maxQty;
--
Gitblit v1.9.1