1.merge

Administrator

2021-04-27 63993d30a95fcb678768ce3da82b8f01c99223c7

 P066.Data/ReadFile.cs

@@ -35,7 +35,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName=data[0].Split('-')[2].Substring(0,6)+ data[0].Split('-')[2].Substring(8, 1),
                            FileName=data[0].Split('-')[2].Substring(0,9)+"白点",
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -61,7 +61,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                            FileName = data[0].Split('-')[2].Substring(0, 9) + "白点",
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -99,7 +99,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                            FileName = data[0].Split('-')[2].Substring(0,9) + "刮白",
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -124,7 +124,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                            FileName = data[0].Split('-')[2].Substring(0, 9) + "刮白",
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -162,7 +162,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                            FileName = data[0].Split('-')[2].Substring(0, 9) + "划伤",
                            ImageFileName = data[0],
                            JudgmentResult = "NG",
                            Result = data[3] == "OK",
@@ -186,7 +186,7 @@
                        {
                            TimeTip = data[0].Split('-')[0],
                            Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                            FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                            FileName = data[0].Split('-')[2].Substring(0, 9)+ "划伤",
                            ImageFileName = data[0],
                            JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                            Result = data[3] == "OK",
@@ -214,7 +214,7 @@
                    {
                        TimeTip = data[0].Split('-')[0],
                        Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
                        FileName = data[0].Split('-')[2].Substring(0, 6) + data[0].Split('-')[2].Substring(8, 1),
                        FileName = data[0].Split('-')[2].Substring(0, 9) + "镀膜破损",
                        ImageFileName = data[0],
                        JudgmentResult = "NG",
                        DefectType = data[1],