Jack.Peng
2021-05-09 140bb4a37bff593217f0e261f52603bbd5afc7a1
P066.Data/Form1.cs
@@ -77,7 +77,6 @@
                //读取全部表格
            var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
            List<ResultData> listSum = new List<ResultData>();
            var listAllSum = new List<ResultData>();
            List<Task> listTask = new List<Task>();
            var DataTipsort = new List<string>();
@@ -91,27 +90,39 @@
                listTask.Add(task);
            }
            DataTipsort = readfile.TimeStamp(fileinfos1[0]);//读取一个文件夹的时间戳
            Task.WaitAll(listTask.ToArray());
            Task.WaitAll(listTask.ToArray());//等全部读取完后再进行下一步
            Dictionary<int, string> dictionary = new Dictionary<int, string>();
            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++)
            {
                int indexMax = j;
                for (int i = 1; i < 5; i++)
                {
                    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));
                    });
                    listTask.Add(task);
                }
            }
            for (int i = 1; i < 5; i++)
            {
                int index = i;
                //Task task = Task.Run(() =>
                //{
                    listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "初检中框镜头" + i + "_" + 1 + "白点"),
                       listAllSum.FindAll(a => a.FileName == "初检中框镜头" + i + "_" + 2 + "白点"), DataTipsort));
                //});
                int index = i;
                Task task = Task.Run(() =>
                {
                    listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 1 + "刮白"),
                                                        listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 2 + "刮白"), DataTipsort));
                });
                //listTask.Add(task);
                listTask.Add(task);
            }
            Task.WaitAll(listTask.ToArray());