Jack.Peng
2021-03-16 94c0e4e36f18eb5a45a86eaf9f14acc6d418c1ba
P066.Data/Form1.cs
@@ -24,7 +24,7 @@
        {
            InitializeComponent();
            //ConfigHelper.Save(@"D:\P066-Data\P066XML\1.xml", runparam);
            runparam = ConfigHelper.Load<P066RunParam>(@"D:\P066-Data\P066XML\Jin_Mid.xml");
            runparam = ConfigHelper.Load<P066RunParam>(@"E:\P066.Data\P066XML\Jin_Mid.xml");
            
        }
@@ -125,9 +125,9 @@
                        GuaNum=GuaNum+1;
                        filenameDir = "复检中框刮白";
                        filename = "复检中框刮白" + GuaNum;
                    judgeList = GetMidLocation(judgeList);
                    judgeList = GetBkLocation(judgeList);
                    //给镜头区分位置及角度
                    list = GetMidLocation(list);
                    list = GetBkLocation(list);
                }
               else if (fileinfos1[i].Name.Contains("初检背板"))
                {
@@ -321,6 +321,14 @@
                        if (distance < 20)
                        {
                            itemToRemove.Add(list2[j]);
                            //if (list1[i].PostTreatmentResults=="")
                            //{
                            //    list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
                            //}
                            //else
                            //{
                            //    list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
                            //}
                        }
                    }
                }
@@ -409,6 +417,14 @@
                                list1[i].JudgmentResult = "NG";
                                list2[j].JudgmentResult = "NG";
                            }
                            //if (list1[i].PostTreatmentResults == "")
                            //{
                            //    list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
                            //}
                            //else
                            //{
                            //    list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
                            //}
                        }
                    }
@@ -477,15 +493,13 @@
                if (data[3]== "刮白")
                {
                    defectType = "刮白";
                    judgmentresult = "NG";
                    judgmentresult =data[1];
                    Ptr = "刮白";
                }
                else
                {
                    defectType = "白点";
                    judgmentresult = data[1];
                }
                if (data[6] == "-")