From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改，避免来回 2. 添加单键测量结果补偿 3. 部分条件限制，日志修改 4. 来料检debug，添加退出条件判断
---
src/Bro.M071.DBManager/ExcelExportHelper.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/Bro.M071.DBManager/ExcelExportHelper.cs b/src/Bro.M071.DBManager/ExcelExportHelper.cs
index 443b6fb..b804e74 100644
--- a/src/Bro.M071.DBManager/ExcelExportHelper.cs
+++ b/src/Bro.M071.DBManager/ExcelExportHelper.cs
@@ -12,20 +12,23 @@
public class ExcelExportSet
{
- public List<string> Worksheets { get; set; }
+ public List<string> Worksheets { get; set; } = new List<string>();
/// <summary>
/// Key锛� Worksheet鐨勫悕绉� Value:Worksheet瀵瑰簲鐨勫垪鍚嶉泦鍚�(key 涓鸿瀵煎嚭鐨勫垪鍚� value 涓哄鍑哄悗鏄剧ず鐨勫垪鍚�)
/// </summary>
- public Dictionary<string, Dictionary<string, string>> WorksheetColumns { get; set; }
- public Dictionary<string, DataTable> WorksheetDataTable { get; set; }
+ public Dictionary<string, Dictionary<string, string>> WorksheetColumns { get; set; } = new Dictionary<string, Dictionary<string, string>>();
- public ExcelExportSet()
- {
- Worksheets = new List<string>();
- WorksheetColumns = new Dictionary<string, Dictionary<string, string>>();
- WorksheetDataTable = new Dictionary<string, DataTable>();
- }
+ public Dictionary<string, Dictionary<string, string>> WorksheetRows { get; set; } = new Dictionary<string, Dictionary<string, string>>();
+
+ public Dictionary<string, DataTable> WorksheetDataTable { get; set; } = new Dictionary<string, DataTable>();
+
+ //public ExcelExportSet()
+ //{
+ // Worksheets = new List<string>();
+ // WorksheetColumns = new Dictionary<string, Dictionary<string, string>>();
+ // WorksheetDataTable = new Dictionary<string, DataTable>();
+ //}
}
@@ -265,6 +268,7 @@
return "";
}
}
-
}
+
+
}
--
Gitblit v1.8.0