From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy,原来是为了避免内存泄漏,但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收,怀疑其中也有非托管对象资源,测试确实起到内存回收作用

---
 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