From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:22:09 +0800
Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息，添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿
---
src/ExcelTest/Form1.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/ExcelTest/Form1.cs b/src/ExcelTest/Form1.cs
index 2b45114..ddb97c6 100644
--- a/src/ExcelTest/Form1.cs
+++ b/src/ExcelTest/Form1.cs
@@ -23,7 +23,7 @@
private void button1_Click(object sender, EventArgs e)
{
SaveExcel();
- SaveTxt();
+ //SaveTxt();
}
public async void SaveExcel()
@@ -50,7 +50,7 @@
measurementUnitResult.MeasurementName = "娴嬭瘯" + i;
measurementUnitResult.MeasurementType = "Slant";
measurementUnitResult.MeasurementValue = (i + 10).ToString();
- measurementUnitResult.MeasurementResult = "OK";
+ measurementUnitResult.MeasurementResult = (i % 2) == 1? "OK":"NG";
measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList.Add(measurementUnitResult);
}
@@ -77,14 +77,15 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
- byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
+
string dir = Path.Combine(@"D:\PROJECTS\M071", DateTime.Now.ToString("yyyyMMdd"));
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
-
- FileStream fs = new FileStream(Path.Combine(dir, $"test_133535.xlsx"), FileMode.Append, FileAccess.Write);
+ var fileName = Path.Combine(dir, $"test_133536.xlsx");
+ byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
+ FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
fs.Write(filecontent, 0, filecontent.Length);
fs.Flush();
fs.Close();
--
Gitblit v1.8.0