P066.Data.git - Gitblit

			@@ -11,7 +11,6 @@
			using Bro.Common;
			using Bro.Common.Util;
			using System.Configuration;

			namespace P066.Data
			{
			public partial class Form1 : Form
			@@ -58,11 +57,31 @@

			private void btnAnalyze_Click(object sender, EventArgs e)
			{

			var Start = DateTime.Now;
			#region 读取文件夹下的所有文件，并将文件按照上下进行区分;上表格为fileInfo1，下表格为fileInfo2
			GentClassificationFile(directoryInfo1, out List<FileInfo> fileInfo1, out List<FileInfo> fileInfo2); //fileInfo1复检上文件夹，fileInfo2复检下文件夹
			List<FileInfo> fileInfo1 = new List<FileInfo>();
			List<FileInfo> fileInfo2 = new List<FileInfo>();
			List<FileInfo> fileInfo3 = new List<FileInfo>();
			List<FileInfo> fileInfo4 = new List<FileInfo>();
			Task task1 = new Task(() =>
			{
			if (directoryInfo1 != null)
			{
			GentClassificationFile(directoryInfo1, out List<FileInfo> FileInfo1, out List<FileInfo> FileInfo2); //fileInfo1复检上文件夹，fileInfo2复检下文件夹
			fileInfo1 = FileInfo1;
			fileInfo2 = FileInfo2;
			}
			if (directoryInfo3 != null)
			{
			GentClassificationFile(directoryInfo3, out List<FileInfo> FileInfo3, out List<FileInfo> FileInfo4); //fileInfo3初检上文件夹，fileInfo4初检下文件夹
			fileInfo3 = FileInfo3;
			fileInfo4 = FileInfo4;
			}
			});
			task1.Start();
			task1.Wait();

			#endregion
			List<ResultData> DataListMerge = new List<ResultData>();
			var ListReexaminationSum = new List<ResultData>(); //复检报表数据
			var ListPreliminarySum = new List<ResultData>(); //初检报表数据
			string filenameDir = "";
			@@ -109,86 +128,153 @@
			}
			#endregion



			#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 DataTipsor)
			var tt1 =DateTime.Now;
			var task2= Task.Run (() =>
			{
			var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
			writefile.WriteJR(Lens1,item,1,file12);
			var Lens2 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
			writefile.WriteJR(Lens2,"",2,file12);
			var Lens3 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
			writefile.WriteJR(Lens3,"",3,file12);
			var Lens4 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
			writefile.WriteJR(Lens4,"",4,file12);

			}
			#endregion

			ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));





			#region//根据产品编号输出总缺陷报表
			if (directoryInfo3!=null)
			});
			var task3= Task.Run(() =>
			{
			GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3初检上文件夹，fileInfo4初检下文件夹
			ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor));
			List<ResultData> ListNoClearNub = 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);
			File.AppendAllText(file, "\r\n");
			ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //合并初检上下报表，输出合并后数据


			});

			//Task.WaitAll(task2, task3);

			task2.Wait();
			var task5 = 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 DataTipsor)
			{
			//总缺陷数
			var ListLenSum1 = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlensum1 = ListLenSum1.Count;
			//未清除数
			var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlennoclearsum1 = ListLenNoClearSum1.Count;
			//设备清除数
			var listlenclearsum1 = listlensum1 - listlennoclearsum1;
			//复检多检出数
			var ListLenMaySum1 = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlenmaysum1 = ListLenMaySum1.Count;

			var content1 = $"{item},{1},{listlensum1},{listlenclearsum1},{listlennoclearsum1},{listlenmaysum1}";
			File.AppendAllText(file, content1, Encoding.UTF8);
			File.AppendAllText(file, "\r\n");

			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 ListLenSum = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlensum = ListLenSum.Count;
			//未清除数
			var ListLenNoClearSum = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlennoclearsum = ListLenNoClearSum.Count;
			//设备清除数
			var listlenclearsum = listlensum - listlennoclearsum;
			//复检多检出数
			var ListLenMaySum = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlenmaysum = ListLenMaySum.Count;
			var content = $"{""},{i},{listlensum},{listlenclearsum},{listlennoclearsum},{listlenmaysum}";
			File.AppendAllText(file, content, Encoding.UTF8);
			File.AppendAllText(file, "\r\n");
			var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
			writefile.WriteJR(Lens, "", i, file12);
			}

			}
			directoryInfo3 = null;
			}

			#endregion
			#endregion


			});
			task3.Wait();
			var task6 = Task.Run(() =>
			{

			#region//根据产品编号输出总缺陷报表
			if (directoryInfo3 != null)
			{
			//GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3初检上文件夹，fileInfo4初检下文件夹
			//ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //合并初检上下报表，输出合并后数据
			List<ResultData> ListNoClearNub = 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);
			File.AppendAllText(file, "\r\n");
			foreach (var item in DataTipsor)
			{
			//总缺陷数
			var ListLenSum1 = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlensum1 = ListLenSum1.Count;
			//未清除数
			var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlennoclearsum1 = ListLenNoClearSum1.Count;
			//设备清除数
			var listlenclearsum1 = listlensum1 - listlennoclearsum1;
			//复检多检出数
			var ListLenMaySum1 = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "白点" && !a.Result);
			var listlenmaysum1 = ListLenMaySum1.Count;

			var content1 = $"{item},{1},{listlensum1},{listlenclearsum1},{listlennoclearsum1},{listlenmaysum1}";
			File.AppendAllText(file, content1, Encoding.UTF8);
			File.AppendAllText(file, "\r\n");

			for (int i = 2; i < 5; i++)
			{
			//总缺陷数
			var ListLenSum = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlensum = ListLenSum.Count;
			//未清除数
			var ListLenNoClearSum = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlennoclearsum = ListLenNoClearSum.Count;
			//设备清除数
			var listlenclearsum = listlensum - listlennoclearsum;
			//复检多检出数
			var ListLenMaySum = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "白点" && !a.Result);
			var listlenmaysum = ListLenMaySum.Count;
			var content = $"{""},{i},{listlensum},{listlenclearsum},{listlennoclearsum},{listlenmaysum}";
			File.AppendAllText(file, content, Encoding.UTF8);
			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 / defectSum)}";
			File.AppendAllText(file1, content1, Encoding.UTF8);
			File.AppendAllText(file1, "\r\n");
			}


			directoryInfo3 = null;
			}

			#endregion
			});


			Task.WaitAll(new Task[]{ task5, task6});





			var tt2 =DateTime.Now;
			var sumtt = tt2 - tt1;







			var End = DateTime.Now;
			var Time = Start - End;
			MessageBox.Show("处理完毕，用时"+Convert.ToString(Time));
			}

			#region 两个表格进行比较,如果两个表格中有设备判断标准不统一，将该点变为NG，删除两个表格中NG点相近的最小尺寸点.
			@@ -683,44 +769,52 @@
			List<ResultData> ListReexaminationSum = new List<ResultData>();
			int WhiteI = 0;
			int WhiteningI = 0;
			List<Task> listTask = new List<Task>();
			for (int i = 0; i < fileInfo1.Count; i++)
			{
			var list = CompareFile(fileInfo1[i], fileInfo2[i], DataTipsor);
			if (fileInfo1[i].Name.Contains("白点"))
			{
			WhiteI++;
			list.ForEach(a => a.Lensnumber = WhiteI);
			ListReexaminationSum.AddRange(list);
			}
			else if (fileInfo1[i].Name.Contains("刮白"))
			{
			WhiteningI++;
			list.ForEach(a => a.Lensnumber = WhiteningI);
			ListReexaminationSum.AddRange(list);
			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);
			ListReexaminationSum.AddRange(list);
			}
			else if (fileInfo1[index].Name.Contains("刮白"))
			{
			WhiteningI++;
			list.ForEach(a => a.Lensnumber = WhiteningI);
			ListReexaminationSum.AddRange(list);

			}
			if (fileInfo1[i].Name.Contains("初检中框"))
			{
			list = GetMidLocation(list);
			}
			else if (fileInfo1[i].Name.Contains("复检中框") && fileInfo1[i].Name.Contains("白点"))
			{
			list = GetMidLocation(list);
			}
			else if (fileInfo1[i].Name.Contains("复检中框") && fileInfo1[i].Name.Contains("刮白"))
			{
			list = GetWhiteLocation(list);
			}
			else if (fileInfo1[i].Name.Contains("初检背板"))
			{
			//给镜头区分位置及角度
			list = GetBkLocation(list);
			}
			else if (fileInfo1[i].Name.Contains("复检背板") && fileInfo1[i].Name.Contains("白点"))
			{
			list = GetBkLocation(list);
			}
			}
			if (fileInfo1[index].Name.Contains("初检中框"))
			{
			list = GetMidLocation(list);
			}
			else if (fileInfo1[index].Name.Contains("复检中框") && fileInfo1[index].Name.Contains("白点"))
			{
			list = GetMidLocation(list);
			}
			else if (fileInfo1[index].Name.Contains("复检中框") && fileInfo1[index].Name.Contains("刮白"))
			{
			list = GetWhiteLocation(list);
			}
			else if (fileInfo1[index].Name.Contains("初检背板"))
			{
			//给镜头区分位置及角度
			list = GetBkLocation(list);
			}
			else if (fileInfo1[index].Name.Contains("复检背板") && fileInfo1[index].Name.Contains("白点"))
			{
			list = GetBkLocation(list);
			}
			});
			task.Start();
			listTask.Add(task);

			}
			Task.WaitAll(listTask.ToArray());
			return ListReexaminationSum;
			}
			#endregion