diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java index b04ae16..bd6fbe9 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockExportExcel.java @@ -8,17 +8,20 @@ import java.time.LocalDateTime; @Data public class StockExportExcel { - @ExcelProperty(index = 0, value = "巷道号") + @ExcelProperty(index = 0, value = "巷道名称") private String streetName; - @ExcelProperty(index = 4, value = "品规") - private String category; + @ExcelProperty(index = 6, value = "盘点批次号") + private String lotnum; + + @ExcelProperty(index = 4, value = "条码") + private String code; @ExcelProperty(index = 1, value = "货架号") private String shelveId; - @ExcelProperty(index = 5, value = "数量") - private Integer count; +// @ExcelProperty(index = 5, value = "数量") +// private Integer count; @ExcelProperty(index = 2, value = "行") private Integer row; @@ -26,10 +29,10 @@ public class StockExportExcel { @ExcelProperty(index = 3, value = "列") private Integer column; - @ExcelProperty(index = 6, value = "人工复核结果", converter = StockStatusConvert.class) + @ExcelProperty(index = 5, value = "盘点结果", converter = StockStatusConvert.class) private Integer status; - @ExcelProperty(index = 7, value = "复核时间", converter = LocalDateTimeConvert.class) + @ExcelProperty(index = 7, value = "时间", converter = LocalDateTimeConvert.class) private LocalDateTime exportTime; } diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 79397cb..636f304 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -264,9 +264,10 @@ public class StockService { List stockExportExcels = new ArrayList<>(stocks.size()); stocks.forEach(stock -> { StockExportExcel stockExportExcel = new StockExportExcel(); - stockExportExcel.setCategory(stock.getCategory()); + stockExportExcel.setCode(stock.getTrayCode()); + stockExportExcel.setLotnum(stock.getLotnum()); stockExportExcel.setColumn(stock.getColumn()); - stockExportExcel.setCount(stock.getCount()); + //stockExportExcel.setCount(stock.getCount()); stockExportExcel.setRow(stock.getRow()); stockExportExcel.setStreetName(street.getName()); stockExportExcel.setExportTime(stock.getExportTime());