修复报表命名不按顺序输出问题。

Administrator

2021-03-13 48b32dfabf9c73bf5785e4d20f3b2e4d873aeeaf

 P066.Data/Form1.cs

@@ -46,8 +46,12 @@
            var listSum = new List<ResultData>();
            var JudgeListSum = new List<ResultData>();
            string filename = "";
            string filenameDir = "";
            int WhiteI = 0;
            int WhiteningI = 0;
            int ChuNum = 0;
            int FuNum = 0;
            int GuaNum = 0;
            for (int i = 0; i < fileinfos1.Length; i++)
            {
                var list = CompareFile(fileinfos1[i], fileinfos2[i]);
@@ -77,18 +81,25 @@
                #region//判断是初检文件夹还是复检文件夹
                if (fileinfos1[i].Name.Contains("初检"))
                {
                    filename = "初检";
                    ChuNum++;
                    filenameDir = "初检";
                    filename = "初检"+ ChuNum;
                }
                if (fileinfos1[i].Name.Contains("复检"))
               else if (fileinfos1[i].Name.Contains("复检")&& fileinfos1[i].Name.Contains("白点"))
                {
                    filename = "复检";
                    FuNum=FuNum+1;
                    filenameDir = "复检";
                    filename = "复检" + FuNum;
                }
                if (fileinfos1[i].Name.Contains("刮白"))
                else if ( fileinfos1[i].Name.Contains("复检")&&fileinfos1[i].Name.Contains("刮白"))
                {
                    filename = "刮白";
                        GuaNum=GuaNum+1;
                        filenameDir = "刮白";
                        filename = "刮白" + GuaNum;
                }

                currPath = directoryInfo1.Parent.Parent.FullName;
                string subPath = currPath + "/" + filename + "合并后" + "/";
                string subPath = currPath + "/" + filenameDir + "合并后" + "/";
                if (false==Directory.Exists(subPath))
                {
                    Directory.CreateDirectory(subPath);
@@ -112,8 +123,8 @@

                #endregion  

                var title1 = $"时间戳,文件名,判断,可能性,不确定性,高,宽,X,Y,最大尺寸,位置,R,角度,缺陷类型";
                var file1 = $"{subPath}\\{filename + (i+1)}.csv";
                var title1 = $"时间戳,文件名,判断,可能性,不确定性,高,宽,X,Y,最大尺寸,位置,R,角度";
                var file1 = $"{subPath}\\{filename}.csv";
                File.AppendAllText(file1, title1, Encoding.UTF8);
                File.AppendAllText(file1, "\r\n");

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

                    var content = $"{item.TimeTip},{item.ImageFileName},{result},{item.Probability},{item.Uncertainty},{item.Height},{item.Width},{item.X},{item.Y},{item.ex},{item.location},{ Convert.ToInt32(item.R)},{ Convert.ToInt32(item.angle)},{item.DefectType}";
                var dataListSum11 = new List<string>();

                foreach (var item in list)
                {
                    dataListSum11.Add(item.TimeTip);
                }
                dataListSum11 = dataListSum11.Distinct().ToList();
                dataListSum11.Sort();
                foreach (var item in dataListSum11)
                {
                    var list11 = list.FindAll(a =>a.TimeTip==item&&!a.Result);
                    for (int q = 0; q < list11.Count; q++)
                    {
                        string result = list11[q].Result ? "OK" : "NG";

                        var content = $"{list11[q].TimeTip},{list11[q].ImageFileName},{result},{list11[q].Probability},{list11[q].Uncertainty},{list11[q].Height},{list11[q].Width},{list11[q].X},{list11[q].Y},{list11[q].ex},{list11[q].location},{ Convert.ToInt32(list11[q].R)},{ Convert.ToInt32(list11[q].angle)}";

                    File.AppendAllText(file1, content, Encoding.UTF8);
                    File.AppendAllText(file1, "\r\n");
                    }


                }
            }

@@ -158,7 +183,7 @@
            var dataList = new List<ResultData>();
            #region//将设备判断结果输出到CSV报表中
            var title12 = $"时间戳,相机序号,设备判断结果,缺陷类型,最大尺寸,位置,X,Y,R,角度";
            var file12 = $"{directoryInfo1.Parent.FullName}\\{filename+"设备判断结果"}.csv";
            var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "设备判断结果"}.csv";
            File.AppendAllText(file12, title12, Encoding.UTF8);
            File.AppendAllText(file12, "\r\n");
            foreach (var item in dataListSum)
@@ -180,7 +205,7 @@

            #region//根据产品编号输出总缺陷报表
            var title = $"产品编号,镜头编号,总缺陷数量";
            var file = $"{directoryInfo1.Parent.FullName}\\{filename+ "缺陷总数报表"}.csv";
            var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缺陷总数报表"}.csv";
            File.AppendAllText(file, title, Encoding.UTF8);
            File.AppendAllText(file, "\r\n");
            var listSumGroup = listSum.GroupBy(a => a.TimeTip);
@@ -307,13 +332,13 @@
                    list2.Remove(itemToRemove[i]);
                }

                dataList11.AddRange(list1);
                dataList22.AddRange(list2);
                dataList.AddRange(list1);
                dataList.AddRange(list2);
            }


            dataList.AddRange(dataList1);
            dataList.AddRange(dataList2);
            //dataList.AddRange(dataList1);
            //dataList.AddRange(dataList2);
            return dataList;
        }
        //统计设备判断结果