From 61c53b1fba282a27fb2b7d18339dabde52e54c9f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期六, 13 三月 2021 16:13:20 +0800
Subject: [PATCH] 1.修复产品中没有任何一个缺陷，设备判断结果无法输出该产品的BUG； 2.将时间戳统一排序。
---
P066.Data/Form1.cs | 147 ++++++++++++++++++++++++++----------------------
1 files changed, 80 insertions(+), 67 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index dba3812..99df811 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -52,10 +52,27 @@
int ChuNum = 0;
int FuNum = 0;
int GuaNum = 0;
+ #region//鑾峰彇鏃堕棿鎴冲苟鎺掑簭
+ var allLines1 = File.ReadAllLines(fileinfos1[0].FullName, Encoding.Default);
+ List<ResultData> dataList1 = new List<ResultData>();
+ if (allLines1.Length > 1)
+ {
+ dataList1 = GetData(allLines1);
+ }
+ var dataGroup111 = dataList1.GroupBy(a => a.TimeTip);
+ var dataListSum22 = new List<string>();
+ foreach (var item in dataGroup111)
+ {
+ dataListSum22.Add(item.Key);
+ }
+ dataListSum22 = dataListSum22.Distinct().ToList();
+ dataListSum22.Sort();
+ #endregion
+
for (int i = 0; i < fileinfos1.Length; i++)
{
- var list = CompareFile(fileinfos1[i], fileinfos2[i]);
- var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i]);
+ var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
+ var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
if (fileinfos1[i].Name.Contains("鐧界偣"))
{
@@ -144,16 +161,8 @@
// File.AppendAllText(file2, "\r\n");
//}
#endregion
-
- 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)
+
+ foreach (var item in dataListSum22)
{
var list11 = list.FindAll(a =>a.TimeTip==item&&!a.Result);
for (int q = 0; q < list11.Count; q++)
@@ -171,22 +180,12 @@
}
- var dataGroup1 = listSum.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
-
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
- var dataList = new List<ResultData>();
#region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧鍒ゆ柇缁撴灉"}.csv";
File.AppendAllText(file12, title12, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
- foreach (var item in dataListSum)
+ foreach (var item in dataListSum22)
{
var Lens1 = JudgeListSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
WriteJR(Lens1,item,1,file12);
@@ -208,19 +207,18 @@
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);
- foreach (var item in listSumGroup)
+ foreach (var item in dataListSum22)
{
- var listLensnumber1 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ var listLensnumber1 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
var listLensnumberCount1 = listLensnumber1.Count;
- var listLensnumber2 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
+ var listLensnumber2 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
var listLensnumberCount2 = listLensnumber2.Count;
- var listLensnumber3 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
+ var listLensnumber3 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
var listLensnumberCount3 = listLensnumber3.Count;
- var listLensnumber4 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
+ var listLensnumber4 = listSum.FindAll(a => a.TimeTip == item&& a.Lensnumber == 4);
var listLensnumberCount4 = listLensnumber4.Count;
//绗竴琛�
- var content1 = $"{item.Key},{1},{listLensnumberCount1}";
+ var content1 = $"{item},{1},{listLensnumberCount1}";
File.AppendAllText(file, content1, Encoding.UTF8);
File.AppendAllText(file, "\r\n");
//绗簩琛�
@@ -243,7 +241,7 @@
}
- private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2)
+ private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
{
var allLines1 = File.ReadAllLines(fileInfo1.FullName, Encoding.Default);
var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
@@ -262,26 +260,26 @@
#region //灏嗘椂闂存埑鐩稿悓鐨勫垎涓轰竴缁勫苟鎺掑簭
- var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
- var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
+ //var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
+ //var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
+ //var dataListSum = new List<string>();
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- foreach (var item in dataGroup2)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
+ //foreach (var item in dataGroup1)
+ //{
+ // dataListSum.Add(item.Key);
+ //}
+ //foreach (var item in dataGroup2)
+ //{
+ // dataListSum.Add(item.Key);
+ //}
+ //dataListSum = dataListSum.Distinct().ToList();
+ //dataListSum.Sort();
#endregion
var dataList = new List<ResultData>();
var dataList11 = new List<ResultData>();
var dataList22 = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
@@ -342,7 +340,7 @@
return dataList;
}
//缁熻璁惧鍒ゆ柇缁撴灉
- private List<ResultData> JudgeCompareFile(FileInfo fileInfo1, FileInfo fileInfo2)
+ private List<ResultData> JudgeCompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
{
#region //灞忚斀
@@ -434,26 +432,26 @@
#region //灏嗘椂闂存埑鐩稿悓鐨勫垎涓轰竴缁勫苟鎺掑簭
- var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
- var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
+ //var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
+ //var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
+ //var dataListSum = new List<string>();
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- foreach (var item in dataGroup2)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
+ //foreach (var item in dataGroup1)
+ //{
+ // dataListSum.Add(item.Key);
+ //}
+ //foreach (var item in dataGroup2)
+ //{
+ // dataListSum.Add(item.Key);
+ //}
+ //dataListSum = dataListSum.Distinct().ToList();
+ //dataListSum.Sort();
#endregion
var dataList = new List<ResultData>();
var dataList11 = new List<ResultData>();
var dataList22 = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
@@ -515,7 +513,7 @@
}
//var itemToRemove = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList11.FindAll(a => a.TimeTip == item/* && a.JudgmentResult == "NG"*/ ); //涓嶇OK銆丯G閮借杈撳嚭
@@ -572,12 +570,6 @@
-
- if (data[6]=="-")
- {
- continue;
- }
-
string defectType = "";
string bbb = "";
//string Ptr = "";
@@ -601,6 +593,27 @@
}
+
+ if (data[6] == "-")
+ {
+
+
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1],
+ Result = data[3] == "OK",
+ DefectType = defectType,
+ PostTreatmentResults = Ptr,
+
+ }); ; ;
+
+ continue;
+
+ }
+
+
var data6 = data[6].Split('#').ToList();
data6.Remove("");
var temp6 = Convert.ToInt32(data6[0]);
--
Gitblit v1.8.0