From 63993d30a95fcb678768ce3da82b8f01c99223c7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期二, 27 四月 2021 19:46:45 +0800
Subject: [PATCH] 1.merge
---
P066.Data/ReadFile.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/P066.Data/ReadFile.cs b/P066.Data/ReadFile.cs
index cbc181f..19b5b3f 100644
--- a/P066.Data/ReadFile.cs
+++ b/P066.Data/ReadFile.cs
@@ -34,6 +34,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName=data[0].Split('-')[2].Substring(0,9)+"鐧界偣",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -58,6 +60,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鐧界偣",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -94,6 +98,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0,9) + "鍒櫧",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -104,7 +110,7 @@
X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
DefectType = data[3] == "OK" ? "OK" : "鍒櫧",
- PostTreatmentResults = "鍒櫧",
+ PostTreatmentResults = "",
}); ; ;
nametemp = data[0];
@@ -117,10 +123,12 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒櫧",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
- PostTreatmentResults = "鍒櫧",
+ PostTreatmentResults = "",
}); ; ;
}
@@ -153,6 +161,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒掍激",
ImageFileName = data[0],
JudgmentResult = "NG",
Result = data[3] == "OK",
@@ -163,7 +173,7 @@
X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
DefectType = data[3],
- PostTreatmentResults = "鍒掍激",
+ PostTreatmentResults = "",
}); ; ;
nametemp = data[0];
resulttemp = data[1];
@@ -175,6 +185,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9)+ "鍒掍激",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -201,10 +213,12 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "闀�鑶滅牬鎹�",
ImageFileName = data[0],
JudgmentResult = "NG",
DefectType = data[1],
- PostTreatmentResults = "闀�鑶滅牬鎹�",
+ PostTreatmentResults = "",
}); ; ;
}
@@ -252,6 +266,7 @@
public double R = 0;
public string DefectType = "";
public string PostTreatmentResults = "";
+ public string FileName = "";
}
--
Gitblit v1.8.0