Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/P066.Data

Administrator

2021-04-20 66db86994285f6907573896f06a6223af3e09e3e

 P066.Data/ReadFile.cs

@@ -34,6 +34,7 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -58,6 +59,7 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -94,6 +96,7 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -104,7 +107,7 @@
                            X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
                            Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
                            DefectType = data[3] == "OK" ? "OK" : "刮白",
                            PostTreatmentResults = "刮白",
                            PostTreatmentResults = "",
                        }); ; ;

                        nametemp = data[0];
@@ -117,10 +120,11 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
                            PostTreatmentResults = "刮白",
                            PostTreatmentResults = "",
                        }); ; ;
                    }

@@ -153,6 +157,7 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = "NG",
                            Result = data[3] == "OK",
@@ -163,7 +168,7 @@
                            X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
                            Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
                            DefectType = data[3],
                            PostTreatmentResults = "划伤",
                            PostTreatmentResults = "",
                        }); ; ;
                        nametemp = data[0];
                        resulttemp = data[1];
@@ -175,6 +180,7 @@
                        dataList.Add(new ResultData()
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -201,10 +207,11 @@
                    dataList.Add(new ResultData()
                    {
                        TimeTip = data[0].Split('-')[0],
                        Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                        ImageFileName = data[0],
                        JudgmentResult = "NG",
                        DefectType = data[1],
                        PostTreatmentResults = "镀膜破损",
                        PostTreatmentResults = "",
                    }); ; ;
                }