修复报表合并后有输出OK信息的BUG。

Jack.Peng

2021-03-13 357f5077cf86d0749596bcc14fd21a1ae7ad26f9

修复报表合并后有输出OK信息的BUG。

 P066.Data/Form1.cs

@@ -133,7 +133,8 @@
                //    File.AppendAllText(file2, "\r\n");
                //}
                #endregion
                foreach (var item in list)
                var list11 = list.FindAll(a => !a.Result);
                foreach (var item in list11)
                {
                    string result = item.Result ? "OK" : "NG";

@@ -155,26 +156,24 @@
            dataListSum = dataListSum.Distinct().ToList();
            dataListSum.Sort();
            var dataList = new List<ResultData>();

            #region//将设备判断结果输出到CSV报表中
            var title12 = $"时间戳,相机序号,设备判断结果,缺陷类型,最大尺寸,位置,X,Y,R,角度";
            var file12 = $"{directoryInfo1.Parent.FullName}\\{filename+"设备判断结果"}.csv";

            File.AppendAllText(file12, title12, Encoding.UTF8);
            File.AppendAllText(file12, "\r\n");
 
            foreach (var item in dataListSum)
            {
                var Lens1 = JudgeListSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
                WriteJR(Lens1,item,file12);
                WriteJR(Lens1,item,1,file12);
                var Lens2 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
                WriteJR(Lens2,item,file12);
                WriteJR(Lens2,"",2,file12);
                var Lens3 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
                WriteJR(Lens3,item,file12);
                WriteJR(Lens3,"",3,file12);
                var Lens4 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
                WriteJR(Lens4,item,file12);
                WriteJR(Lens4,"",4,file12);

            }

            #endregion



@@ -772,12 +771,12 @@
        }


        private void WriteJR(List<ResultData> Lens,string item, string file12)
        private void WriteJR(List<ResultData> Lens,string item,int LensNumb, string file12)
        {
            if (Lens.Count == 0)
            {

                var content11 = $"{item},{1},{"OK"}";
                var content11 = $"{item},{LensNumb},{"OK"}";
                File.AppendAllText(file12, content11, Encoding.UTF8);
                File.AppendAllText(file12, "\r\n");
            }
@@ -785,7 +784,7 @@
            {
                if (Lens[0].DefectType == "刮白")
                {
                    var content11 = $"{item},{1},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    File.AppendAllText(file12, content11, Encoding.UTF8);
                    File.AppendAllText(file12, "\r\n");
                    for (int i = 0; i < Lens.Count; i++)
@@ -807,7 +806,7 @@
                }
                else
                {
                    var content11 = $"{item},{1},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    File.AppendAllText(file12, content11, Encoding.UTF8);
                    File.AppendAllText(file12, "\r\n");
                    for (int i = 0; i < Lens.Count; i++)