From 63a52ec239c245954def02450f91925b4003f924 Mon Sep 17 00:00:00 2001
From: DELL <56479841@qq.com>
Date: 星期二, 25 六月 2024 16:25:25 +0800
Subject: [PATCH] 只能有一个在设备上走的工作档

---
 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 6439522..c5656d4 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
@@ -28,32 +28,32 @@
     @ExcelProperty(value= "鍗曚綅", index = 3)
     private String unit;
 
-    @ExcelProperty(value= "灏哄", index = 4)
+   // @ExcelProperty(value= "灏哄", index = 4)
     private String size;
 
-    @ExcelProperty(value= "棰滆壊", index = 5)
+    @ExcelProperty(value= "棰滆壊", index = 4)
     private String color;
 
-    @ExcelProperty(value= "鍗曢噸", index = 6)
+    @ExcelProperty(value= "姣忕閲嶉噺(KG)", index = 5)
     private Double weight;
 
-//    @ExcelProperty(value= "", index = 12)
+    //@ExcelProperty(value= "", index = 7)
     private String str1;
 
-//    @ExcelProperty(value= "", index = 5)
+  // @ExcelProperty(value= "鐗╂枡瑙勬牸", index = 7)
     private String str2;
 
-//    @ExcelProperty(value= "", index = 28)
+   @ExcelProperty(value= "瀹㈡埛鍚嶇О", index = 6)
     private String str3;
 
-//    @ExcelProperty(value= "", index = 14)
+    @ExcelProperty(value= "椤圭洰淇℃伅", index = 7)
     private String str4;
 
-//    @ExcelProperty(value= "鍔╄鐮�", index = 7)
+    @ExcelProperty(value= "绫诲埆", index = 8)
     private String str5;
 
-//    @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
-    private String str6;
+    @ExcelProperty(value= "姣忕鏁伴噺(PCS)", index = 9)
+    private Double str6;
 
 //    @ExcelProperty(value= "榛樿浠撳簱", index = 13)
     private String str7;
@@ -85,7 +85,7 @@
     public MatCodeExcel() {
     }
 
-    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, String str6, String str7, String str8, String str9, String str10,Double num1, Double num2, Double num3, Double num4, Double num5) {
+    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;
         this.barcode = barcode;
         this.matName = matName;

--
Gitblit v1.9.1