diff --git a/src/main/java/com/gaotao/modules/check/controller/PhysicalInventoryController.java b/src/main/java/com/gaotao/modules/check/controller/PhysicalInventoryController.java index c27f85f..d194b55 100644 --- a/src/main/java/com/gaotao/modules/check/controller/PhysicalInventoryController.java +++ b/src/main/java/com/gaotao/modules/check/controller/PhysicalInventoryController.java @@ -659,7 +659,7 @@ public class PhysicalInventoryController { // Sheet1: 标签明细 - rqrq Sheet sheet1 = workbook.createSheet("标签明细"); - String[] labelHeaders = {"标签号", "物料号", "物料描述", "数量", "批号", "栈板号", "所在层数", "标签类型", "盘点状态", "盘点人", "盘点时间", "仓库", "库位"}; + String[] labelHeaders = {"标签号", "物料号", "物料描述", "数量", "批号", "栈板号", "所在层数", "标签类型", "盘点状态", "盘点日期", "仓库", "库位"}; createHeaderRow(sheet1, labelHeaders, headerStyle); int rowNum1 = 1; for (CountLabelData item : labelList) { @@ -673,10 +673,9 @@ public class PhysicalInventoryController { row.createCell(6).setCellValue(item.getLocationZ() != null ? item.getLocationZ() : 0); row.createCell(7).setCellValue(item.getLabelTypeDesc() != null ? item.getLabelTypeDesc() : ""); row.createCell(8).setCellValue(item.getCountFlagDesc() != null ? item.getCountFlagDesc() : ""); - row.createCell(9).setCellValue(item.getCountUser() != null ? item.getCountUser() : ""); - row.createCell(10).setCellValue(item.getCountDate() != null ? item.getCountDate().toString() : ""); - row.createCell(11).setCellValue(item.getWarehouseName() != null ? item.getWarehouseName() : ""); - row.createCell(12).setCellValue(item.getLocationName() != null ? item.getLocationName() : ""); + row.createCell(9).setCellValue(item.getCountDate() != null ? item.getCountDate().toString() : ""); + row.createCell(10).setCellValue(item.getWarehouseName() != null ? item.getWarehouseName() : ""); + row.createCell(11).setCellValue(item.getLocationName() != null ? item.getLocationName() : ""); } // Sheet2: 物料汇总 - rqrq