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 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/P066.Data/ReadFile.cs b/P066.Data/ReadFile.cs
index f59e65a..19b5b3f 100644
--- a/P066.Data/ReadFile.cs
+++ b/P066.Data/ReadFile.cs
@@ -35,6 +35,7 @@
                         {
                             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",
@@ -60,6 +61,7 @@
                         {
                             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",
@@ -97,6 +99,7 @@
                         {
                             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",
@@ -121,6 +124,7 @@
                         {
                             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",
@@ -158,6 +162,7 @@
                         {
                             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",
@@ -181,6 +186,7 @@
                         {
                             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",
@@ -208,6 +214,7 @@
                     {
                         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],
@@ -259,6 +266,7 @@
         public double R = 0;
         public string DefectType = "";
         public string PostTreatmentResults = "";
+        public string FileName = "";
 
 
     }

--
Gitblit v1.8.0