From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 6c2b125..b4d60ae 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1563,6 +1563,7 @@
headerList.add("订单状态");
headerList.add("课题组");
headerList.add("课题组负责人");
+ headerList.add("到货时间");
HSSFWorkbook hssfWorkbook =exportExcelOrder(headerList, realDataList);
hssfWorkbook.write(out);
out.flush();
@@ -1628,6 +1629,7 @@
dataRow.createCell(13).setCellValue(dataList.get(i).getStatus()== null ? "": String.valueOf(dataList.get(i).getStatus().getText()));
dataRow.createCell(14).setCellValue(dataList.get(i).getProject()== null ? "": String.valueOf(dataList.get(i).getProject()));
dataRow.createCell(15).setCellValue(dataList.get(i).getProjectManage()== null ? "": String.valueOf(dataList.get(i).getProjectManage()));
+ dataRow.createCell(16).setCellValue(dataList.get(i).getArrivalTime()== null ? "": String.valueOf(dataList.get(i).getArrivalTime()));
}
return hssfWorkbook;
}
--
Gitblit v1.9.2