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);
                }

@@ -777,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);

                    }