|
|
@@ -263,7 +263,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
foreach (string file in txtFiles)
|
|
|
{
|
|
|
- LogMessage(file);
|
|
|
+ //LogMessage(file);
|
|
|
if (Device.SelectedIndex == 0) // SPI 已测试对接
|
|
|
{
|
|
|
ParseLogInsert(file);
|
|
|
@@ -341,7 +341,7 @@ namespace UAS_MES_NEW.Make
|
|
|
Console.WriteLine();
|
|
|
}
|
|
|
}
|
|
|
- LogMessage($"共找到{txtFiles.Length}个{currFileType.ToUpper()}文件");
|
|
|
+ //LogMessage($"共找到{txtFiles.Length}个{currFileType.ToUpper()}文件");
|
|
|
}
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
@@ -361,11 +361,11 @@ namespace UAS_MES_NEW.Make
|
|
|
|
|
|
List<Log> logArr = new List<Log>() { };
|
|
|
string[] lines = restOfStream.Split(new string[] { "\r\n" }, StringSplitOptions.None);
|
|
|
- int fileNum = 0;
|
|
|
+ int fileNum = string.IsNullOrEmpty(lines[lines.Length - 1]) ? lines.Length - 1 : lines.Length;
|
|
|
+ LogMessage($"文件夹{PathName},共{fileNum}条记录");
|
|
|
foreach (var item in lines)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(item)) continue;
|
|
|
- fileNum++;
|
|
|
string[] currItem = item.Split(',');
|
|
|
string res = "";
|
|
|
/*List<NgData> data = new List<NgData>();*/
|
|
|
@@ -413,7 +413,6 @@ namespace UAS_MES_NEW.Make
|
|
|
|
|
|
LogMessage($"已解析: {currItem[0]}");
|
|
|
}
|
|
|
- LogMessage($"文件夹{PathName},共{fileNum}条记录");
|
|
|
InsertDb(logArr, PathName);
|
|
|
|
|
|
File.WriteAllText(PathName, string.Empty);
|