From 14c9a820cec697c024b2058ba1c63db2f5f84a5e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期四, 18 三月 2021 09:40:51 +0800
Subject: [PATCH] 1.新增程序自动区分文件夹的上、下。
---
P066.Data/Form1.cs | 78 +++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 2e19fc1..d0416d3 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -49,9 +49,26 @@
private void btnAnalyze_Click(object sender, EventArgs e)
{
- var fileinfos1 = directoryInfo1.GetFiles();
-
- var fileinfos2 = directoryInfo2.GetFiles();
+ var fileinfos11 = directoryInfo1.GetFiles();
+ //var fileinfos22 = directoryInfo2.GetFiles();
+ List<FileInfo> fileInfo1 = new List<FileInfo>();
+ List<FileInfo> fileInfo2 = new List<FileInfo>();
+ for (int i = 0; i < fileinfos11.Length; i++)
+ {
+ if (fileinfos11[i].Name.Contains("1_1") || fileinfos11[i].Name.Contains("2_1") || fileinfos11[i].Name.Contains("3_1") || fileinfos11[i].Name.Contains("4_1") )
+ {
+ fileInfo1.Add(fileinfos11[i]);
+ }
+ else
+ {
+ fileInfo2.Add(fileinfos11[i]);
+ }
+
+
+ }
+
+
+
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
string filename = "";
@@ -62,7 +79,7 @@
int FuNum = 0;
int GuaNum = 0;
#region//鑾峰彇鏃堕棿鎴冲苟鎺掑簭
- var allLines1 = File.ReadAllLines(fileinfos1[0].FullName, Encoding.Default);
+ var allLines1 = File.ReadAllLines(fileInfo1[0].FullName, Encoding.Default);
List<ResultData> dataList1 = new List<ResultData>();
if (allLines1.Length > 1)
{
@@ -78,12 +95,12 @@
dataListSum22.Sort();
#endregion
- for (int i = 0; i < fileinfos1.Length; i++)
+ for (int i = 0; i < fileInfo1.Count; i++)
{
- var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
- var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
+ var list = CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
+ var judgeList = JudgeCompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
- if (fileinfos1[i].Name.Contains("鐧界偣"))
+ if (fileInfo1[i].Name.Contains("鐧界偣"))
{
WhiteI++;
list.ForEach(a => a.Lensnumber = WhiteI);
@@ -91,7 +108,7 @@
judgeList.ForEach(a => a.Lensnumber = WhiteI);
JudgeListSum.AddRange(judgeList);
}
- if (fileinfos1[i].Name.Contains("鍒櫧"))
+ if (fileInfo1[i].Name.Contains("鍒櫧"))
{
WhiteningI++;
list.ForEach(a => a.Lensnumber = WhiteningI);
@@ -103,7 +120,7 @@
string currPath = "";
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
- if (fileinfos1[i].Name.Contains("鍒濇涓"))
+ if (fileInfo1[i].Name.Contains("鍒濇涓"))
{
ChuNum++;
filenameDir = "鍒濇涓鐧界偣";
@@ -112,7 +129,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetMidLocation(list);
}
- else if (fileinfos1[i].Name.Contains("澶嶆涓")&& fileinfos1[i].Name.Contains("鐧界偣"))
+ else if (fileInfo1[i].Name.Contains("澶嶆涓")&& fileInfo1[i].Name.Contains("鐧界偣"))
{
FuNum=FuNum+1;
filenameDir = "澶嶆涓鐧界偣";
@@ -121,7 +138,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetMidLocation(list);
}
- else if ( fileinfos1[i].Name.Contains("澶嶆涓") &&fileinfos1[i].Name.Contains("鍒櫧"))
+ else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鍒櫧"))
{
GuaNum=GuaNum+1;
filenameDir = "澶嶆涓鍒櫧";
@@ -130,7 +147,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetBkLocation(list);
}
- else if (fileinfos1[i].Name.Contains("鍒濇鑳屾澘"))
+ else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
{
ChuNum++;
filenameDir = "鍒濇鑳屾澘鐧界偣";
@@ -139,7 +156,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetBkLocation(list);
}
- else if (fileinfos1[i].Name.Contains("澶嶆鑳屾澘") && fileinfos1[i].Name.Contains("鐧界偣"))
+ else if (fileInfo1[i].Name.Contains("澶嶆鑳屾澘") && fileInfo1[i].Name.Contains("鐧界偣"))
{
FuNum = FuNum + 1;
filenameDir = "澶嶆鑳屾澘鐧界偣";
@@ -149,7 +166,7 @@
list = GetBkLocation(list);
}
- currPath = directoryInfo1.Parent.Parent.FullName;
+ currPath = directoryInfo1.Parent.FullName;
string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
if (false==Directory.Exists(subPath))
{
@@ -505,25 +522,13 @@
var nametemp = allLines[1].Split(',')[0];
var resulttemp = allLines[1].Split(',')[1];
string Ptr = "";
- //if (allLines[1].Split(',')[10].Length>3)
- //{
- // Ptr = allLines[1].Split(',')[10];
- //}
-
string defectType = "";
for (int i = 1; i < allLines.Length; i++)
{
var data = allLines[i].Split(',');
- //if (data.Length>10)
- //{
- // Ptr = data[10];
- //}
-
-
- //string Ptr = "";
if (data[0] == "")
{
data[0] = nametemp;
@@ -542,6 +547,7 @@
else
{
defectType = "鐧界偣";
+ Ptr = data[10];
}
if (data[6] == "-")
@@ -583,14 +589,14 @@
}
}
data[7] = Convert.ToString(temp7);
- if (data[3]=="NG")
- {
- Ptr = data[10];
- }
- else
- {
- Ptr = "";
- }
+ //if (data[3]=="NG")
+ //{
+ // Ptr = data[10];
+ //}
+ //else
+ //{
+ // Ptr = "";
+ //}
dataList.Add(new ResultData()
{
@@ -733,7 +739,7 @@
}
return list;
}
- //鑾峰彇涓瑙掑害鍜屼綅缃�
+ //鑾峰彇涓鍒櫧瑙掑害鍜屼綅缃�
private List<ResultData> GetWhiteLocation(List<ResultData> list)
{
var group = list.GroupBy(a => a.TimeTip);
--
Gitblit v1.8.0