From 94c0e4e36f18eb5a45a86eaf9f14acc6d418c1ba Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期二, 16 三月 2021 09:13:01 +0800
Subject: [PATCH] 1.修复以前刮白就是NG的问题。
---
P066.Data/Form1.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index be15bec..2cd64fb 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -24,7 +24,7 @@
{
InitializeComponent();
//ConfigHelper.Save(@"D:\P066-Data\P066XML\1.xml", runparam);
- runparam = ConfigHelper.Load<P066RunParam>(@"D:\P066-Data\P066XML\Jin_Mid.xml");
+ runparam = ConfigHelper.Load<P066RunParam>(@"E:\P066.Data\P066XML\Jin_Mid.xml");
}
@@ -125,9 +125,9 @@
GuaNum=GuaNum+1;
filenameDir = "澶嶆涓鍒櫧";
filename = "澶嶆涓鍒櫧" + GuaNum;
- judgeList = GetMidLocation(judgeList);
+ judgeList = GetBkLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetMidLocation(list);
+ list = GetBkLocation(list);
}
else if (fileinfos1[i].Name.Contains("鍒濇鑳屾澘"))
{
@@ -321,6 +321,14 @@
if (distance < 20)
{
itemToRemove.Add(list2[j]);
+ //if (list1[i].PostTreatmentResults=="")
+ //{
+ // list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ //}
+ //else
+ //{
+ // list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ //}
}
}
}
@@ -409,6 +417,14 @@
list1[i].JudgmentResult = "NG";
list2[j].JudgmentResult = "NG";
}
+ //if (list1[i].PostTreatmentResults == "")
+ //{
+ // list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ //}
+ //else
+ //{
+ // list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ //}
}
}
@@ -477,15 +493,13 @@
if (data[3]== "鍒櫧")
{
defectType = "鍒櫧";
- judgmentresult = "NG";
+ judgmentresult =data[1];
Ptr = "鍒櫧";
}
else
{
defectType = "鐧界偣";
judgmentresult = data[1];
-
-
}
if (data[6] == "-")
--
Gitblit v1.8.0