From a65ca60179efb2bd6e1c8907a42285463512d3e2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 08:05:51 +0800
Subject: [PATCH] 修改 # 前端添加字典选择
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 52 ++++++++++++++++------------------------------------
1 files changed, 16 insertions(+), 36 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 7ecf8b2..9904ef6 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,8 +1,6 @@
package com.vincent.rsf.server.manager.entity.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.handler.inter.IExcelDataModel;
-import cn.afterturn.easypoi.handler.inter.IExcelModel;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
import lombok.Data;
@@ -10,6 +8,7 @@
import lombok.ToString;
import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@@ -20,32 +19,34 @@
* @create 2025/3/3 08:40
*/
@Data
-@ExcelAutoColumnSize
-@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatnrsTemplate implements IExcelModel, IExcelDataModel, Serializable {
+public class MatnrsTemplate {
+ @NotNull
@Excel(name = "鐗╂枡鍚嶇О")
@ExcelComment(example = "鍗庝负鎵嬫満")
private String name;
- @Excel(name = "璐т富缂栫爜")
- @ExcelComment(example = "PO12625")
- private String shipperCode;
+ @NotNull
+ @Excel(name = "鍒嗙被鍔╄鐮�")
+ @ExcelComment(example = "256874556")
+ private String groupCode;
+ @NotNull
@Excel(name = "鍒嗙被鍚嶇О")
@ExcelComment(example = "绉诲姩璁惧")
private String groupName;
+ @NotNull
@Excel(name = "鐗╂枡鍔╄鐮�")
@ExcelComment(example = "P3528461569")
private String erpCode;
+ @NotNull
@Excel(name = "瑙勬牸")
@ExcelComment(example = "HW-148*68*10")
private String spec;
+ @NotNull
@Excel(name = "鍨嬪彿")
@ExcelComment(example = "鍗庝负涓夋姌鍙�")
private String model;
@@ -70,6 +71,7 @@
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String nromNum;
+ @NotNull
@Excel(name = "涓诲崟浣�")
@ExcelComment(example = "閮�")
private String unit;
@@ -79,7 +81,7 @@
private String purUnit;
@Excel(name = "ABC绫�")
- @ExcelComment(notNull = false, example = "A")
+ @ExcelComment(notNull = false, example = "0")
private String stockLevel;
@Excel(name = "瀹夊叏搴撳瓨閲�")
@@ -90,6 +92,7 @@
@ExcelComment(notNull = false, example = "10")
private String minQty;
+ @NotNull
@Excel(name = "鏈�澶у簱瀛橀噺")
@ExcelComment(notNull = false, example = "150")
private String maxQty;
@@ -107,35 +110,12 @@
private String barcode;
@Excel(name = "鏁堟湡棰勮闃堝��")
- @ExcelComment(notNull = false, example = "2025-01-25 14:25:36")
+ @ExcelComment(notNull = false, example = "90")
private String validWarn;
@Excel(name = "鏄惁鍏嶆")
- @ExcelComment(notNull = false, example = "鍚�")
+ @ExcelComment(notNull = false, example = "0")
private String flagCheck;
- private Integer rowNum;
- private String errorMsg;
-
-
- @Override
- public Integer getRowNum() {
- return this.rowNum;
- }
-
- @Override
- public void setRowNum(Integer rowNum) {
- this.rowNum = rowNum;
- }
-
- @Override
- public String getErrorMsg() {
- return this.errorMsg;
- }
-
- @Override
- public void setErrorMsg(String errorMsg) {
- this.errorMsg = errorMsg;
- }
}
--
Gitblit v1.9.1