From 48b32dfabf9c73bf5785e4d20f3b2e4d873aeeaf Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期六, 13 三月 2021 10:50:40 +0800
Subject: [PATCH] 修复报表命名不按顺序输出问题。
---
P066.Data/Form1.cs | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1f313bd..dba3812 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -46,8 +46,12 @@
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
string filename = "";
+ string filenameDir = "";
int WhiteI = 0;
int WhiteningI = 0;
+ int ChuNum = 0;
+ int FuNum = 0;
+ int GuaNum = 0;
for (int i = 0; i < fileinfos1.Length; i++)
{
var list = CompareFile(fileinfos1[i], fileinfos2[i]);
@@ -77,18 +81,25 @@
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
if (fileinfos1[i].Name.Contains("鍒濇"))
{
- filename = "鍒濇";
+ ChuNum++;
+ filenameDir = "鍒濇";
+ filename = "鍒濇"+ ChuNum;
}
- if (fileinfos1[i].Name.Contains("澶嶆"))
+ else if (fileinfos1[i].Name.Contains("澶嶆")&& fileinfos1[i].Name.Contains("鐧界偣"))
{
- filename = "澶嶆";
+ FuNum=FuNum+1;
+ filenameDir = "澶嶆";
+ filename = "澶嶆" + FuNum;
}
- if (fileinfos1[i].Name.Contains("鍒櫧"))
- {
- filename = "鍒櫧";
- }
+ else if ( fileinfos1[i].Name.Contains("澶嶆")&&fileinfos1[i].Name.Contains("鍒櫧"))
+ {
+ GuaNum=GuaNum+1;
+ filenameDir = "鍒櫧";
+ filename = "鍒櫧" + GuaNum;
+ }
+
currPath = directoryInfo1.Parent.Parent.FullName;
- string subPath = currPath + "/" + filename + "鍚堝苟鍚�" + "/";
+ string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
if (false==Directory.Exists(subPath))
{
Directory.CreateDirectory(subPath);
@@ -112,8 +123,8 @@
#endregion
- var title1 = $"鏃堕棿鎴�,鏂囦欢鍚�,鍒ゆ柇,鍙兘鎬�,涓嶇‘瀹氭��,楂�,瀹�,X,Y,鏈�澶у昂瀵�,浣嶇疆,R,瑙掑害,缂洪櫡绫诲瀷";
- var file1 = $"{subPath}\\{filename + (i+1)}.csv";
+ var title1 = $"鏃堕棿鎴�,鏂囦欢鍚�,鍒ゆ柇,鍙兘鎬�,涓嶇‘瀹氭��,楂�,瀹�,X,Y,鏈�澶у昂瀵�,浣嶇疆,R,瑙掑害";
+ var file1 = $"{subPath}\\{filename}.csv";
File.AppendAllText(file1, title1, Encoding.UTF8);
File.AppendAllText(file1, "\r\n");
@@ -133,15 +144,29 @@
// File.AppendAllText(file2, "\r\n");
//}
#endregion
- var list11 = list.FindAll(a => !a.Result);
- foreach (var item in list11)
+
+ var dataListSum11 = new List<string>();
+
+ foreach (var item in list)
{
- string result = item.Result ? "OK" : "NG";
+ dataListSum11.Add(item.TimeTip);
+ }
+ dataListSum11 = dataListSum11.Distinct().ToList();
+ dataListSum11.Sort();
+ foreach (var item in dataListSum11)
+ {
+ var list11 = list.FindAll(a =>a.TimeTip==item&&!a.Result);
+ for (int q = 0; q < list11.Count; q++)
+ {
+ string result = list11[q].Result ? "OK" : "NG";
- var content = $"{item.TimeTip},{item.ImageFileName},{result},{item.Probability},{item.Uncertainty},{item.Height},{item.Width},{item.X},{item.Y},{item.ex},{item.location},{ Convert.ToInt32(item.R)},{ Convert.ToInt32(item.angle)},{item.DefectType}";
+ var content = $"{list11[q].TimeTip},{list11[q].ImageFileName},{result},{list11[q].Probability},{list11[q].Uncertainty},{list11[q].Height},{list11[q].Width},{list11[q].X},{list11[q].Y},{list11[q].ex},{list11[q].location},{ Convert.ToInt32(list11[q].R)},{ Convert.ToInt32(list11[q].angle)}";
- File.AppendAllText(file1, content, Encoding.UTF8);
- File.AppendAllText(file1, "\r\n");
+ File.AppendAllText(file1, content, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ }
+
+
}
}
@@ -158,7 +183,7 @@
var dataList = new List<ResultData>();
#region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
- var file12 = $"{directoryInfo1.Parent.FullName}\\{filename+"璁惧鍒ゆ柇缁撴灉"}.csv";
+ var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧鍒ゆ柇缁撴灉"}.csv";
File.AppendAllText(file12, title12, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
foreach (var item in dataListSum)
@@ -180,7 +205,7 @@
#region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�";
- var file = $"{directoryInfo1.Parent.FullName}\\{filename+ "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
File.AppendAllText(file, title, Encoding.UTF8);
File.AppendAllText(file, "\r\n");
var listSumGroup = listSum.GroupBy(a => a.TimeTip);
@@ -307,13 +332,13 @@
list2.Remove(itemToRemove[i]);
}
- dataList11.AddRange(list1);
- dataList22.AddRange(list2);
+ dataList.AddRange(list1);
+ dataList.AddRange(list2);
}
- dataList.AddRange(dataList1);
- dataList.AddRange(dataList2);
+ //dataList.AddRange(dataList1);
+ //dataList.AddRange(dataList2);
return dataList;
}
//缁熻璁惧鍒ゆ柇缁撴灉
--
Gitblit v1.8.0