From e86e385d5c1eb06a05d4f46439194093c7f66472 Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期一, 17 五月 2021 20:51:11 +0800
Subject: [PATCH] 1.一件读取，并处理.(未完成)
---
P066.Data/ReadFile.cs | 12 +++++-
P066.Data/Form1.cs | 71 +++++++++++++++++++++++++++++------
2 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1a80e53..d27e4ea 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -76,10 +76,14 @@
//璇诲彇鍏ㄩ儴琛ㄦ牸
- var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
- var listAllSum = new List<ResultData>();
+ var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv"&& (a.Name.Contains("鍒櫧") || a.Name.Contains("鐧界偣姣涗笣")) );
+ var listAllSum = new List<ResultData>(); //瀛樻斁鎵�鏈夎〃鏍兼暟鎹�
List<Task> listTask = new List<Task>();
- var DataTipsort = new List<string>();
+ var DataTipsortBack = readfile.TimeStamp(fileinfos1.Find(a=>a.Name.Contains("鍒濇鑳屾澘闀滃ご")));//璇诲彇鑳屾澘鏃堕棿鎴�
+ var DataTipsotMidle = readfile.TimeStamp(fileinfos1.Find(a => a.Name.Contains("鍒濇涓闀滃ご")));//璇诲彇涓鏃堕棿鎴�
+ Dictionary<string, List<string>> dictionarData = new Dictionary<string, List<string>>();
+ dictionarData.Add("鑳屾澘", DataTipsortBack);
+ dictionarData.Add("涓", DataTipsotMidle);
for (int i = 0; i < fileinfos1.Count; i++)
{
int index = i;
@@ -89,12 +93,11 @@
});
listTask.Add(task);
}
- DataTipsort = readfile.TimeStamp(fileinfos1[0]);//璇诲彇涓�涓枃浠跺す鐨勬椂闂存埑
Task.WaitAll(listTask.ToArray());//绛夊叏閮ㄨ鍙栧畬鍚庡啀杩涜涓嬩竴姝�
Dictionary<int, string> dictionary = new Dictionary<int, string>();
- dictionary.Add(1, "鍒濇涓闀滃ご");
- dictionary.Add(2, "澶嶆涓闀滃ご");
- dictionary.Add(3, "鍒濇鑳屾澘闀滃ご");
+ dictionary.Add(1, "鍒濇鑳屾澘闀滃ご");
+ dictionary.Add(2, "鍒濇涓闀滃ご");
+ dictionary.Add(3, "澶嶆涓闀滃ご");
dictionary.Add(4, "澶嶆鑳屾澘闀滃ご");
List<ResultData> listCompareSum = new List<ResultData>();
for (int j = 1; j < 5; j++)
@@ -105,27 +108,68 @@
int index = i;
Task task = Task.Run(() =>
{
- listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "鐧界偣"),
- listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "鐧界偣"), DataTipsort));
+ if (dictionary[indexMax].Substring (2,2)=="涓")
+ {
+ listCompareSum.AddRange(GetMidLocation((CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "鐧界偣"),
+ listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "鐧界偣"), dictionarData[dictionary[indexMax].Substring(2, 2)]))));
+ }
+ else
+ {
+ listCompareSum.AddRange(GetBkLocation((CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "鐧界偣"),
+ listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "鐧界偣"), dictionarData[dictionary[indexMax].Substring(2, 2)]))));
+ }
+
});
listTask.Add(task);
}
}
- List<ResultData> listWhiteningCompareSum=new List<ResultData>();
for (int i = 1; i < 5; i++)
{
int index = i;
Task task = Task.Run(() =>
{
- listWhiteningCompareSum.AddRange(GetWhiteLocation(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 1 + "鍒櫧"),
- listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 2 + "鍒櫧"), DataTipsort)));
+ listCompareSum.AddRange(GetWhiteLocation(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[3] + index + "_" + 1 + "鍒櫧"),
+ listAllSum.FindAll(a => a.FileName == dictionary[3] + index + "_" + 2 + "鍒櫧"), dictionarData[dictionary[3].Substring(2, 2)])));
});
listTask.Add(task);
}
Task.WaitAll(listTask.ToArray());
+
+
+
+
+
+
+ var back = listCompareSum.FindAll(a => a.FileName.Contains("鍒濇鑳屾澘"));
+ var midle = listCompareSum.FindAll(a => a.FileName.Contains("鍒濇涓"));
+ var back1 = listCompareSum.FindAll(a => a.FileName.Contains("澶嶆鑳屾澘"));
+ var midle1 = listCompareSum.FindAll(a => a.FileName.Contains("澶嶆涓"));
+
+
+
+
+ #region//灏嗗鐝澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ var title112 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
+ var file112 = $"{directoryInfo1.Parent.FullName}\\{"澶滅彮璁惧鍒ゆ柇缁撴灉"}.csv";
+ File.AppendAllText(file112, title112, Encoding.UTF8);
+ File.AppendAllText(file112, "\r\n");
+ foreach (var item in DataTipsotMidle)
+ {
+ var Lens1 = midle1.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
+ writefile.WriteJR(Lens1, item, 1, file112);
+ for (int i = 2; i < 5; i++)
+ {
+ var Lens = midle1.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
+ writefile.WriteJR(Lens, "", i, file112);
+ }
+
+ }
+ #endregion
+
@@ -608,7 +652,8 @@
}
#endregion
-
+
+
#region 鑾峰彇涓瑙掑害鍜屼綅缃�
private List<ResultData> GetMidLocation(List<ResultData> list)
diff --git a/P066.Data/ReadFile.cs b/P066.Data/ReadFile.cs
index 85c0fa6..2a1f4c7 100644
--- a/P066.Data/ReadFile.cs
+++ b/P066.Data/ReadFile.cs
@@ -39,7 +39,8 @@
{
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
- FileName=data[0].Split('-')[2].Substring(0,9)+"鐧界偣",
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鐧界偣",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -51,7 +52,7 @@
Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
DefectType = data[3] == "OK" ? "OK" : "鐧界偣",
PostTreatmentResults = data[10],
- }); ; ;
+ }) ; ; ;
nametemp = data[0];
resulttemp = data[1];
@@ -66,6 +67,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "鐧界偣",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -106,6 +108,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒櫧",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -131,6 +134,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒櫧",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -172,6 +176,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒掍激",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = "NG",
Result = data[3] == "OK",
@@ -196,6 +201,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒掍激",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -225,6 +231,7 @@
TimeTip = data[0].Split('-')[0],
Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
FileName = data[0].Split('-')[2].Substring(0, 9) + "闀�鑶滅牬鎹�",
+ FileType = data[0].Split('-')[2].Substring(2, 2),
ImageFileName = data[0],
JudgmentResult = "NG",
DefectType = data[1],
@@ -294,6 +301,7 @@
public string DefectType = "";
public string PostTreatmentResults = "";
public string FileName = "";
+ public string FileType = "";
}
--
Gitblit v1.8.0