1.新增多线程。

Jack.Peng

2021-04-12 93897305bd1c0abeab2588fac214b545d959f232

 P066.Data/Form1.cs

@@ -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,10 +128,31 @@
            }
            #endregion

            var tt1 =DateTime.Now;
           var task2= Task.Run (() =>
            {

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


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

                    ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor));       //合并初检上下报表，输出合并后数据

                
            });
          
            Task.WaitAll(task2, task3);


            var task5 = Task.Run(() =>
            {

            #region//将设备判断结果输出到CSV报表中
            ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
                //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
            var title12 = $"时间戳,相机序号,设备判断结果,缺陷类型,设备后处理结果,最大尺寸,位置,X,Y,R,角度";
            var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "设备判断结果"}.csv";
            File.AppendAllText(file12, title12, Encoding.UTF8);
@@ -121,24 +161,25 @@
            {
                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);
                    for (int i = 2; i < 5; i++)
                    {
                        var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
                        writefile.WriteJR(Lens, "", i, file12);
                    }
               
            }
            #endregion



            });
            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));
                    //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);
@@ -187,8 +228,27 @@
            }

            #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点相近的最小尺寸点.