报表：库存入库订单明细报表

@@ -2,7 +2,6 @@ package com.lframework.xingyun.sc.excel.statistics;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -25,7 +24,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private String customerShortName;
     private String customerShortName;
 
 
     @ExcelProperty(value = "订货日期", index = 3)
     @ExcelProperty(value = "订货日期", index = 3)
-    @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN)
+    @DateTimeFormat("yyyy-MM-dd")
     private Date orderDate;
     private Date orderDate;
 
 
     @ExcelProperty(value = "生产厂", index = 4)
     @ExcelProperty(value = "生产厂", index = 4)
@@ -77,7 +76,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private BigDecimal suggestedPrice;
     private BigDecimal suggestedPrice;
 
 
     @ExcelProperty(value = "交货日期", index = 20)
     @ExcelProperty(value = "交货日期", index = 20)
-    @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN)
+    @DateTimeFormat("yyyy-MM-dd")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     @ExcelProperty(value = "超价协调价", index = 21)
     @ExcelProperty(value = "超价协调价", index = 21)
@@ -161,7 +160,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     @ExcelProperty(value = "备用", index = 47)
     @ExcelProperty(value = "备用", index = 47)
     private String reserve2;
     private String reserve2;
 
 
-    @ExcelProperty(value = "备用", index = 48)
+    @ExcelProperty(value = "备用\u200B", index = 48)
     private String reserve3;
     private String reserve3;
 
 
     @ExcelProperty(value = "备用", index = 49)
     @ExcelProperty(value = "备用", index = 49)
@@ -188,93 +187,72 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     @ExcelProperty(value = "备用", index = 56)
     @ExcelProperty(value = "备用", index = 56)
     private String reserve5;
     private String reserve5;
 
 
-    @ExcelProperty(value = "备用", index = 57)
+    @ExcelProperty(value = "备用\u200B", index = 57)
     private String reserve6;
     private String reserve6;
 
 
     @ExcelProperty(value = "备用", index = 58)
     @ExcelProperty(value = "备用", index = 58)
     private String reserve7;
     private String reserve7;
 
 
-    @ExcelProperty(value = "备用", index = 59)
+    @ExcelProperty(value = "备用\u200B", index = 59)
     private String reserve8;
     private String reserve8;
 
 
     @ExcelProperty(value = "备用", index = 60)
     @ExcelProperty(value = "备用", index = 60)
     private String reserve9;
     private String reserve9;
 
 
-    @ExcelProperty(value = "备用", index = 61)
+    @ExcelProperty(value = "备用\u200B", index = 61)
     private String reserve10;
     private String reserve10;
 
 
     @ExcelProperty(value = "备用", index = 62)
     @ExcelProperty(value = "备用", index = 62)
     private String reserve11;
     private String reserve11;
 
 
-    @ExcelProperty(value = "备用", index = 63)
+    @ExcelProperty(value = "备用\u200B", index = 63)
     private String reserve12;
     private String reserve12;
 
 
     @ExcelProperty(value = "备用", index = 64)
     @ExcelProperty(value = "备用", index = 64)
     private String reserve13;
     private String reserve13;
 
 
-    @ExcelProperty(value = "备用", index = 65)
+    @ExcelProperty(value = "备用\u200B", index = 65)
     private String reserve14;
     private String reserve14;
 
 
     @ExcelProperty(value = "备用", index = 66)
     @ExcelProperty(value = "备用", index = 66)
     private String reserve15;
     private String reserve15;
 
 
-    @ExcelProperty(value = "备用", index = 67)
+    @ExcelProperty(value = "备用\u200B", index = 67)
     private String reserve16;
     private String reserve16;
 
 
     @ExcelProperty(value = "备用", index = 68)
     @ExcelProperty(value = "备用", index = 68)
     private String reserve17;
     private String reserve17;
 
 
-    @ExcelProperty(value = "备用", index = 69)
+    @ExcelProperty(value = "备用\u200B", index = 69)
     private String reserve18;
     private String reserve18;
 
 
     @ExcelProperty(value = "备用", index = 70)
     @ExcelProperty(value = "备用", index = 70)
     private String reserve19;
     private String reserve19;
 
 
-    @ExcelProperty(value = "备用", index = 71)
+    @ExcelProperty(value = "备用\u200B", index = 71)
     private String reserve20;
     private String reserve20;
 
 
     @ExcelProperty(value = "备用", index = 72)
     @ExcelProperty(value = "备用", index = 72)
     private String reserve21;
     private String reserve21;
 
 
-    @ExcelProperty(value = "备用", index = 73)
+    @ExcelProperty(value = "备用\u200B", index = 73)
     private String reserve22;
     private String reserve22;
 
 
     @ExcelProperty(value = "备用", index = 74)
     @ExcelProperty(value = "备用", index = 74)
     private String reserve23;
     private String reserve23;
 
 
-    @ExcelProperty(value = "备用", index = 75)
+    @ExcelProperty(value = "备用\u200B", index = 75)
     private String reserve24;
     private String reserve24;
 
 
     @ExcelProperty(value = "备用", index = 76)
     @ExcelProperty(value = "备用", index = 76)
     private String reserve25;
     private String reserve25;
 
 
-    @ExcelProperty(value = "备用", index = 77)
+    @ExcelProperty(value = "备用\u200B", index = 77)
     private String reserve26;
     private String reserve26;
 
 
     @ExcelProperty(value = "备用", index = 78)
     @ExcelProperty(value = "备用", index = 78)
     private String reserve27;
     private String reserve27;
 
 
-    @ExcelProperty(value = "备用", index = 79)
+    @ExcelProperty(value = "备用\u200B", index = 79)
     private String reserve28;
     private String reserve28;
-
-    @ExcelProperty(value = "备用", index = 80)
-    private String reserve29;
-
-    @ExcelProperty(value = "备用", index = 81)
-    private String reserve30;
-
-    @ExcelProperty(value = "备用", index = 82)
-    private String reserve31;
-
-    @ExcelProperty(value = "备用", index = 83)
-    private String reserve32;
-
-    @ExcelProperty(value = "备用", index = 84)
-    private String reserve33;
-
-    @ExcelProperty(value = "备用", index = 85)
-    private String reserve34;
-
-    @ExcelProperty(value = "备用", index = 86)
-    private String reserve35;
 }
 }