From 95936fd446adc56c6cea36597c24d6eee51474ca Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期四, 18 三月 2021 17:28:28 +0800
Subject: [PATCH] 1.新增刮白、镀膜破损报表统计到设备报表中。
---
P066.Data/Form1.cs | 124 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 16 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 3a052e5..d7e3a78 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -50,7 +50,7 @@
{
var fileinfos11 = directoryInfo1.GetFiles();
- //var fileinfos22 = directoryInfo2.GetFiles();
+ var fileinfos22 = directoryInfo2.GetFiles();
List<FileInfo> fileInfo1 = new List<FileInfo>();
List<FileInfo> fileInfo2 = new List<FileInfo>();
for (int i = 0; i < fileinfos11.Length; i++)
@@ -63,10 +63,7 @@
{
fileInfo2.Add(fileinfos11[i]);
}
-
-
}
-
List<ResultData> DataListMerge = new List<ResultData>();
var listSum = new List<ResultData>();
@@ -98,9 +95,47 @@
#endregion
//濡傛灉闇�瑕佸悎骞惰〃鏍煎氨鎵ц
- if (fileInfo1.Count== fileInfo2.Count)
+
+ for (int i = 0; i < fileinfos22.Length; i++)
{
- for (int i = 0; i < fileInfo1.Count; i++)
+
+ var allLines = File.ReadAllLines(fileinfos22[i].FullName, Encoding.Default);
+ var list = GetData(allLines, GetDefactType(fileinfos22[i])).FindAll(a=>!a.Result); /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
+ for (int ii = 0; ii < list.Count; ii++)
+ {
+ if (list[ii].Width > list[ii].Height)
+ {
+ list[ii].ex = list[ii].Width * 0.0043;
+ }
+ else
+ {
+ list[ii].ex = list[ii].Height * 0.0043;
+ }
+
+ }
+ if (fileinfos22[i].Name.Contains("鍒掍激"))
+ {
+ ScratchI++;
+ list.ForEach(a => a.Lensnumber = ScratchI);
+ listSum.AddRange(list);
+ list = GetBkLocation(list);
+ }
+ else if (fileinfos22[i].Name.Contains("闀�鑶滅牬鎹�"))
+ {
+ ZoomI++;
+ list.ForEach(a => a.Lensnumber = ZoomI);
+ listSum.AddRange(list);
+
+ }
+
+ }
+
+
+
+
+
+
+ for (int i = 0; i < fileInfo1.Count; i++)
{
CompareFile(fileInfo1[i], fileInfo2[i], dataListSum22, out DataListMerge);
var list = DataListMerge; /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
@@ -194,18 +229,18 @@
}
}
- }
+
//涓嶉渶瑕佸悎骞惰〃鏍�
- else if(fileInfo1.Count>0&& fileInfo2.Count==0)
- {
- for (int i = 0; i < fileInfo1.Count; i++)
- {
- var allLines = File.ReadAllLines(fileInfo1[i].FullName, Encoding.Default);
- var list = GetData(allLines,GetDefactType(fileInfo1[i])); /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
+ //else if(fileInfo1.Count>0&& fileInfo2.Count==0)
+ //{
+ // for (int i = 0; i < fileInfo1.Count; i++)
+ // {
+ // var allLines = File.ReadAllLines(fileInfo1[i].FullName, Encoding.Default);
+ // var list = GetData(allLines,GetDefactType(fileInfo1[i])); /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
- }
- }
+ // }
+ //}
@@ -725,7 +760,51 @@
}
else
{
- if (Lens[0].DefectType == "鍒櫧")
+ if (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++)
+ {
+ if (Lens[i].DefectType == "闀�鑶滅牬鎹�")
+ {
+ var content111 = $"{""},{""},{""},{""},{""},{"-"},{"-"},{"-"},{"-"},{"-"},{"-"}";
+ File.AppendAllText(file12, content111, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ }
+ else
+ {
+ var content111 = $"{""},{""},{""},{Lens[i].DefectType},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ File.AppendAllText(file12, content111, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ }
+
+ }
+ }
+ else if (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++)
+ {
+ if (Lens[i].DefectType == "鍒掍激")
+ {
+ var content111 = $"{""},{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ File.AppendAllText(file12, content111, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ }
+ else
+ {
+ var content111 = $"{""},{""},{""},{Lens[i].DefectType},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ File.AppendAllText(file12, content111, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ }
+
+ }
+ }
+ else if (Lens[0].DefectType == "鍒櫧")
{
var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
File.AppendAllText(file12, content11, Encoding.UTF8);
@@ -839,7 +918,20 @@
Ptr = data[10];
}
+ if (defectType== "闀�鑶滅牬鎹�")
+ {
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1] == "OK" ? "OK" : "NG",
+ Result = data[1] == "OK",
+ DefectType = defectType,
+ }); ; ;
+
+ continue;
+ }
if (data[6] == "-")
{
--
Gitblit v1.8.0