代码修改

ruoyi-common/src/main/java/com/ruoyi/common/domain/ExtraField.java

@@ -10,7 +10,68 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ExtraField {
+    @Excel(name = "序号")
+    private String seqNo;
+
+    @Excel(name = "子件")
+    private String subItem;
+
+    @Excel(name = "品号")
+    @NotEmpty(message = "物料GUID不能为空")
     private String productId;
-    private String spec;
-    private String parentId;
+
+    @Excel(name = "品名")
+    private String materialDesc;
+
+    @Excel(name = "英文描述")
+    private String englishDesc;
+
+    @Excel(name = "数量")
+    @NotEmpty(message = "物料数量不能为空")
+    private String quantity;
+
+    @Excel(name = "单位")
+    private String unit;
+
+    @Excel(name = "单件净重Unit Net Weight")
+    private String unitNetWeight;
+
+    @Excel(name = "总净重Total Net Weight")
+    private String totalNetWeight;
+
+    @Excel(name = "箱号Carton NO.")
+    private String cartonNo;
+
+    @Excel(name = "包装方式")
+    private String packingMethod;
+
+    @Excel(name = "长(MM)")
+    private String length;
+
+    @Excel(name = "宽(MM)")
+    private String width;
+
+    @Excel(name = "高(MM)")
+    private String height;
+
+    @Excel(name = "体积m³")
+    private String volume;
+
+    @Excel(name = "净重(KG)NET WEIGHT")
+    private String netWeight;
+
+    @Excel(name = "毛重(KG)GROSS WEIGHT")
+    private String grossWeight;
+
+    @Excel(name = "单价")
+    private String unitPrice;
+
+    @Excel(name = "总价")
+    private String totalPrice;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "批次号")
+    private String lotNo;
 }