From 7b15567ec12bffd6d286188fa78ddf68874e61b3 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期一, 19 四月 2021 20:29:20 +0800
Subject: [PATCH] 1.merge
---
P066.Data/WriteFile.cs | 201 +++++++++++++++++++++++++++++++++----------------
1 files changed, 135 insertions(+), 66 deletions(-)
diff --git a/P066.Data/WriteFile.cs b/P066.Data/WriteFile.cs
index f2b3835..4d919ac 100644
--- a/P066.Data/WriteFile.cs
+++ b/P066.Data/WriteFile.cs
@@ -20,84 +20,153 @@
}
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 = $"{""},{""},{""},{""},{""},{"-"},{"-"},{"-"},{"-"},{"-"},{"-"}";
- 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 == "鍒掍激" || 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 == "鍒掍激" || 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 lensWhite=Lens.FindAll(a => a.DefectType == "鐧界偣");
+ var lensWhiten = Lens.FindAll(a => a.DefectType == "鍒櫧");
+ var lensScratchPart = Lens.FindAll(a => a.DefectType == "鍒掍激" || a.DefectType == "鑴忔薄");
+ var lensZoomPart = Lens.FindAll(a => a.DefectType == "闀�鑶滅牬鎹�");
+ var JudgmentResult = Lens.FindAll(a => a.JudgmentResult == "NG");
+ if (JudgmentResult.Count>0)
{
- var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
- File.AppendAllText(file12, content11, Encoding.UTF8);
+ var contentFist = $"{item},{LensNumb},{"NG"}";
+ File.AppendAllText(file12, contentFist, 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
{
- var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType},{Lens[0].PostTreatmentResults}";
- File.AppendAllText(file12, content11, Encoding.UTF8);
+ var contentFist = $"{item},{LensNumb},{"OK"}";
+ File.AppendAllText(file12, contentFist, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
- for (int i = 0; i < Lens.Count; i++)
+ }
+
+
+
+ if (lensWhite.Count!=0)
+ {
+
+ var content = $"{""},{""},{""},{lensWhite[0].DefectType},{lensWhite[0].PostTreatmentResults}";
+ File.AppendAllText(file12, content, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ for (int i = 0; i < lensWhite.Count; i++)
{
- 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);
+ var content1 = $"{""},{""},{""},{""},{""},{lensWhite[i].ex},{lensWhite[i].location},{lensWhite[i].X},{lensWhite[i].Y},{(int)(lensWhite[i].R)},{(int)(lensWhite[i].angle)}";
+ File.AppendAllText(file12, content1, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
}
}
+ if (lensWhiten.Count!=0)
+ {
+
+ var content = $"{""},{""},{""},{lensWhiten[0].DefectType},{lensWhiten[0].PostTreatmentResults}";
+ File.AppendAllText(file12, content, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ for (int i = 0; i < lensWhiten.Count; i++)
+ {
+ var content1 = $"{""},{""},{""},{""},{""},{lensWhiten[i].ex},{lensWhiten[i].location},{lensWhiten[i].X},{lensWhiten[i].Y},{(int)(lensWhiten[i].R)},{(int)(lensWhiten[i].angle)}";
+ File.AppendAllText(file12, content1, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //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 == "鍒掍激" || 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 == "鍒掍激" || 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);
+ // 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
+ //{
+ // var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType},{Lens[0].PostTreatmentResults}";
+ // File.AppendAllText(file12, content11, Encoding.UTF8);
+ // File.AppendAllText(file12, "\r\n");
+ // for (int i = 0; i < Lens.Count; i++)
+ // {
+ // 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");
+ // }
+ //}
}
}
--
Gitblit v1.8.0