From d011c5b63cc4aa9e6c7034170e50a98d4d1fc5db Mon Sep 17 00:00:00 2001 From: yiming Date: Thu, 19 May 2022 14:13:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9B=A4=E9=BB=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/pojo/stock/StockExportExcel.java | 15 ++++++--------- .../com/zhehekeji/web/service/StockService.java | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) 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..d216ba5 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,28 +8,25 @@ 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 = 4, value = "條碼") + private String code; - @ExcelProperty(index = 1, value = "货架号") + @ExcelProperty(index = 1, value = "貨架號") private String shelveId; - @ExcelProperty(index = 5, value = "数量") - private Integer count; - @ExcelProperty(index = 2, value = "行") private Integer row; @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 = 6, 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 63f4760..300523f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -257,9 +257,9 @@ 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.setColumn(stock.getColumn()); - stockExportExcel.setCount(stock.getCount()); + stockExportExcel.setRow(stock.getRow()); stockExportExcel.setStreetName(street.getName()); stockExportExcel.setExportTime(stock.getExportTime());