From 031e36213941ad3430da2b0429701e742f09f5d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:20 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 39 +++++++--------------------------------
1 files changed, 7 insertions(+), 32 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..688ab4d 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;
@@ -24,15 +22,15 @@
@Accessors(chain = true)
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
-public class MatnrsTemplate implements IExcelModel, IExcelDataModel, Serializable {
+public class MatnrsTemplate implements Serializable {
@Excel(name = "鐗╂枡鍚嶇О")
@ExcelComment(example = "鍗庝负鎵嬫満")
private String name;
- @Excel(name = "璐т富缂栫爜")
- @ExcelComment(example = "PO12625")
- private String shipperCode;
+ @Excel(name = "鍒嗙被鍔╄鐮�")
+ @ExcelComment(example = "256874556")
+ private String groupCode;
@Excel(name = "鍒嗙被鍚嶇О")
@ExcelComment(example = "绉诲姩璁惧")
@@ -79,7 +77,7 @@
private String purUnit;
@Excel(name = "ABC绫�")
- @ExcelComment(notNull = false, example = "A")
+ @ExcelComment(notNull = false, example = "0")
private String stockLevel;
@Excel(name = "瀹夊叏搴撳瓨閲�")
@@ -107,35 +105,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