1.merge

Administrator

2021-04-19 7b15567ec12bffd6d286188fa78ddf68874e61b3

 P066.Data/Form1.cs

@@ -109,16 +109,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);
                }

@@ -182,9 +182,8 @@
                    //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>();       //清除失败数
                    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 +224,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 / defectSum)}";
                        File.AppendAllText(file1, content1, Encoding.UTF8);
                        File.AppendAllText(file1, "\r\n");
                    }


                    directoryInfo3 = null;
                }

@@ -752,14 +777,14 @@
                    var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
                    if (fileInfo1[index].Name.Contains("白点"))
                    {
                        WhiteI++;
                        list.ForEach(a => a.Lensnumber = WhiteI);
                        //WhiteI++;
                        //list.ForEach(a => a.Lensnumber = WhiteI);
                        ListReexaminationSum.AddRange(list);
                    }
                    else if (fileInfo1[index].Name.Contains("刮白"))
                    {
                        WhiteningI++;
                        list.ForEach(a => a.Lensnumber = WhiteningI);
                        //WhiteningI++;
                        //list.ForEach(a => a.Lensnumber = WhiteningI);
                        ListReexaminationSum.AddRange(list);

                    }