From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 129 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index 4e33277..a61df20 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -1,67 +1,114 @@
package com.zy.common.utils.excel.matcode;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
/**
- * Created by vincent on 2020/6/6
+ * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
+ * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
+ * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
*/
+@Data
+@ExcelIgnoreUnannotated
public class MatCodeExcel {
- /**
- * 鐗╂枡缂栫爜
- */
- @ExcelProperty(value = "鐗╂枡缂栫爜", index = 0)
+ @ExcelProperty(value= "浜у搧浠ｅ彿*", index = 0)
private String matNo;
- /**
- * 鏉＄爜
- */
- @ExcelProperty(value = "鏉＄爜", index = 1)
+// @ExcelProperty(value= "鏉″舰鐮�", index = 4)
private String barcode;
- /**
- * 鐗╂枡鍚嶇О
- */
- @ExcelProperty(value = "鐗╂枡鍚嶇О", index = 2)
+ @ExcelProperty(value= "浜у搧鍚嶇О", index = 1)
private String matName;
- /**
- * 鐗╂枡鍗曚綅
- */
- @ExcelProperty(value = "鐗╂枡鍗曚綅", index = 3)
+ @ExcelProperty(value= "瑙勬牸", index = 2)
+ private String specs;
+
+ @ExcelProperty(value= "鍗曚綅", index = 3)
+ private String unit;
+
+ @ExcelProperty(value= "灏哄", index = 4)
+ private String size;
+
+ @ExcelProperty(value= "棰滆壊", index = 5)
+ private String color;
+
+ @ExcelProperty(value= "鍗曢噸", index = 6)
+ private Double weight;
+
+// @ExcelProperty(value= "", index = 12)
private String str1;
+// @ExcelProperty(value= "", index = 5)
+ private String str2;
- public String getMatNo() {
- return matNo;
+// @ExcelProperty(value= "", index = 28)
+ private String str3;
+
+// @ExcelProperty(value= "", index = 14)
+ private String str4;
+
+// @ExcelProperty(value= "鍔╄鐮�", index = 7)
+ private String str5;
+
+// @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
+ private double str6;
+
+// @ExcelProperty(value= "榛樿浠撳簱", index = 13)
+ private String str7;
+
+// @ExcelProperty(value= "鍝佺墝", index = 9)
+ private String str8;
+
+// @ExcelProperty(value= "閲囪喘鍛�", index = 11)
+ private String str9;
+
+// @ExcelProperty(value= "浜у湴", index = 12)
+ private String str10;
+
+// @ExcelProperty(value= "閲嶉噺", index = 7)
+ private Double num1;
+
+// @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
+ private Double num2;
+
+// @ExcelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
+ private Double num3;
+
+// @ExcelProperty(value= "瀹夊叏搴撳瓨")
+ private Double num4;
+
+// @ExcelProperty(value= "绋庣巼")
+ private Double num5;
+
+ public MatCodeExcel() {
}
- public void setMatNo(String matNo) {
+ public MatCodeExcel(String matNo, String barcode, String matName,String specs,String unit,String size,String color,Double weight, String str1, String str2, String str3, String str4, String str5, Double str6, String str7, String str8, String str9, String str10,Double num1, Double num2, Double num3, Double num4, Double num5) {
this.matNo = matNo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
this.barcode = barcode;
- }
-
- public String getMatName() {
- return matName;
- }
-
- public void setMatName(String matName) {
this.matName = matName;
- }
-
- public String getStr1() {
- return str1;
- }
-
- public void setStr1(String str1) {
+ this.specs = specs;
+ this.unit = unit;
+ this.size = size;
+ this.color = color;
+ this.weight = weight;
this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
+ this.str4 = str4;
+ this.str5 = str5;
+ this.str6 = str6;
+ this.str7 = str7;
+ this.str8 = str8;
+ this.str9 = str9;
+ this.str10 = str10;
+ this.num1 = num1;
+ this.num2 = num2;
+ this.num3 = num3;
+ this.num4 = num4;
+ this.num5 = num5;
}
}
--
Gitblit v1.9.1