From 357f5077cf86d0749596bcc14fd21a1ae7ad26f9 Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期六, 13 三月 2021 09:14:05 +0800
Subject: [PATCH] 修复报表合并后有输出OK信息的BUG。
---
P066.Data/Form1.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 674e712..1f313bd 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -133,7 +133,8 @@
// File.AppendAllText(file2, "\r\n");
//}
#endregion
- foreach (var item in list)
+ var list11 = list.FindAll(a => !a.Result);
+ foreach (var item in list11)
{
string result = item.Result ? "OK" : "NG";
@@ -155,26 +156,24 @@
dataListSum = dataListSum.Distinct().ToList();
dataListSum.Sort();
var dataList = new List<ResultData>();
-
+ #region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
var file12 = $"{directoryInfo1.Parent.FullName}\\{filename+"璁惧鍒ゆ柇缁撴灉"}.csv";
-
File.AppendAllText(file12, title12, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
-
foreach (var item in dataListSum)
{
var Lens1 = JudgeListSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
- WriteJR(Lens1,item,file12);
+ WriteJR(Lens1,item,1,file12);
var Lens2 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
- WriteJR(Lens2,item,file12);
+ WriteJR(Lens2,"",2,file12);
var Lens3 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
- WriteJR(Lens3,item,file12);
+ WriteJR(Lens3,"",3,file12);
var Lens4 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
- WriteJR(Lens4,item,file12);
+ WriteJR(Lens4,"",4,file12);
}
-
+ #endregion
@@ -772,12 +771,12 @@
}
- private void WriteJR(List<ResultData> Lens,string item, string file12)
+ private void WriteJR(List<ResultData> Lens,string item,int LensNumb, string file12)
{
if (Lens.Count == 0)
{
- var content11 = $"{item},{1},{"OK"}";
+ var content11 = $"{item},{LensNumb},{"OK"}";
File.AppendAllText(file12, content11, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
}
@@ -785,7 +784,7 @@
{
if (Lens[0].DefectType == "鍒櫧")
{
- var content11 = $"{item},{1},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
+ var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
File.AppendAllText(file12, content11, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
for (int i = 0; i < Lens.Count; i++)
@@ -807,7 +806,7 @@
}
else
{
- var content11 = $"{item},{1},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
+ var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
File.AppendAllText(file12, content11, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
for (int i = 0; i < Lens.Count; i++)
--
Gitblit v1.8.0