From 1c60d225cc7c1ccf17c3d1e6a84ca0d959550cf3 Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期二, 20 四月 2021 18:54:57 +0800
Subject: [PATCH] 1.新增输出缺陷报表。
---
P066.Data/Form1.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 17 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index f7008a7..b84b654 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -18,6 +18,8 @@
DirectoryInfo directoryInfo1;
DirectoryInfo directoryInfo2;
DirectoryInfo directoryInfo3;
+ DirectoryInfo directoryInfo4;
+
private P066RunParam runparam = new P066RunParam();
private ReadFile readfile = new ReadFile();
private WriteFile writefile = new WriteFile();
@@ -44,6 +46,7 @@
return;
directoryInfo2 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);
+
}
private void btnLoadData3_Click(object sender, EventArgs e)
@@ -54,7 +57,16 @@
}
directoryInfo3 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);
}
+ private void butPictur_Click(object sender, EventArgs e)
+ {
+ if (folderBrowserDialog1.ShowDialog()!=DialogResult.OK)
+ {
+ return;
+ }
+ directoryInfo4 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);
+
+ }
private void btnAnalyze_Click(object sender, EventArgs e)
{
var Start = DateTime.Now;
@@ -109,16 +121,16 @@
var list = GetFileData(fileinfos22[i]);
if (fileinfos22[i].Name.Contains("鍒掍激"))
{
- ScratchI++;
- list.ForEach(a => a.Lensnumber = ScratchI);
+ //ScratchI++;
+ //list.ForEach(a => a.Lensnumber = ScratchI);
GetMaxSize(list);
GetBkLocation(list);
ListReexaminationSum.AddRange(list);
}
else if (fileinfos22[i].Name.Contains("闀�鑶滅牬鎹�"))
{
- ZoomI++;
- list.ForEach(a => a.Lensnumber = ZoomI);
+ //ZoomI++;
+ //list.ForEach(a => a.Lensnumber = ZoomI);
ListReexaminationSum.AddRange(list);
}
@@ -172,6 +184,50 @@
});
+
+ List<string> listPicyreSor = new List<string>(); //鍔犺浇鍥剧墖鏃堕棿鎴�
+ var directoties = directoryInfo4.GetDirectories();
+ for (int i = 0; i < directoties.Length; i++)
+ {
+ listPicyreSor.Add(directoties[i].Name);
+ }
+ listPicyreSor.Sort();
+
+ if (listPicyreSor.Count!=0)
+ {
+ Task.Run(() =>
+ {
+
+ #region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
+ var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧妫�绱㈢粨鏋�"}.csv";
+ File.AppendAllText(file12, title12, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ foreach (var item in listPicyreSor)
+ {
+ var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
+ writefile.WriteJR(Lens1, item, 1, file12);
+ for (int i = 2; i < 5; i++)
+ {
+ var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
+ writefile.WriteJR(Lens, "", i, file12);
+ }
+
+ }
+
+
+
+ });
+ }
+
+
+
+
+
+
+
+
task3.Wait();
var task6 = Task.Run(() =>
{
@@ -182,9 +238,8 @@
//GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3鍒濇涓婃枃浠跺す锛宖ileInfo4鍒濇涓嬫枃浠跺す
//ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
List<ResultData> ListNoClearNub = new List<ResultData>(); //娓呴櫎澶辫触鏁�
- List<ResultData> ListMayNub = new List<ResultData>(); //娓呴櫎澶辫触鏁�
+ List<ResultData> ListMayNub = new List<ResultData>(); //澶嶆澶氭鍑烘暟鏁�
CompareFile2(ListReexaminationSum, ListPreliminarySum, DataTipsor, out ListNoClearNub, out ListMayNub);
-
var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,鏈竻闄ゆ暟,澶嶆澶氭鍑烘暟";
var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
File.AppendAllText(file, title, Encoding.UTF8);
@@ -225,6 +280,32 @@
File.AppendAllText(file, "\r\n");
}
}
+ var title1 = $"闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,娓呴櫎鐜�";
+ var file1 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ File.AppendAllText(file1, title1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ for (int i =1; i < 5; i++)
+ {
+ //鍒濇缂洪櫡鏁�
+ var ListLenSum1 = ListPreliminarySum.FindAll(a => a.Lensnumber ==i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum1 = ListLenSum1.Count;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum1 = ListMayNub.FindAll(a=> a.Lensnumber ==i&& a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum1 = ListLenMaySum1.Count;
+ //鎬荤己闄锋暟
+ var defectSum = listlenmaysum1 + listlensum1;
+ //闄ゅ皹鏁�
+ var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum1 = ListLenNoClearSum1.Count;
+ var defectClearSum = listlensum1 - listlennoclearsum1;
+
+
+ var content1 = $"{i},{defectSum},{defectClearSum},{(double)(defectSum / defectClearSum)}";
+ File.AppendAllText(file1, content1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ }
+
+
directoryInfo3 = null;
}
@@ -750,19 +831,19 @@
int index = i;
Task task = new Task(() => {
var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
- if (fileInfo1[index].Name.Contains("鐧界偣"))
- {
- WhiteI++;
- list.ForEach(a => a.Lensnumber = WhiteI);
+ //if (fileInfo1[index].Name.Contains("鐧界偣"))
+ //{
+ //WhiteI++;
+ //list.ForEach(a => a.Lensnumber = WhiteI);
ListReexaminationSum.AddRange(list);
- }
- else if (fileInfo1[index].Name.Contains("鍒櫧"))
- {
- WhiteningI++;
- list.ForEach(a => a.Lensnumber = WhiteningI);
- ListReexaminationSum.AddRange(list);
+ //}
+ //else if (fileInfo1[index].Name.Contains("鍒櫧"))
+ //{
+ //WhiteningI++;
+ //list.ForEach(a => a.Lensnumber = WhiteningI);
+ //ListReexaminationSum.AddRange(list);
- }
+ //}
if (fileInfo1[index].Name.Contains("鍒濇涓"))
{
list = GetMidLocation(list);
@@ -865,3 +946,5 @@
}
+
+#endregion
\ No newline at end of file
--
Gitblit v1.8.0