diff --git a/DDUtilityApp/App.config b/DDUtilityApp/App.config
index 5fe9335..03a2ef0 100644
--- a/DDUtilityApp/App.config
+++ b/DDUtilityApp/App.config
@@ -6,8 +6,6 @@
-
-
diff --git a/DDUtilityApp/DDUtilityApp.csproj b/DDUtilityApp/DDUtilityApp.csproj
index 2554ec1..e76c772 100644
--- a/DDUtilityApp/DDUtilityApp.csproj
+++ b/DDUtilityApp/DDUtilityApp.csproj
@@ -403,6 +403,20 @@
FrmEqSelector.cs
+
+ Form
+
+
+ ProgressForm.cs
+
+
+ Form
+
+
+ ServerLog.cs
+
+
+
Form
@@ -465,6 +479,9 @@
+
+ Always
+
FrmTIbcoConfig.cs
diff --git a/DDUtilityApp/LOGPARSER/FrmEqSelector.cs b/DDUtilityApp/LOGPARSER/FrmEqSelector.cs
index 98a8526..2529984 100644
--- a/DDUtilityApp/LOGPARSER/FrmEqSelector.cs
+++ b/DDUtilityApp/LOGPARSER/FrmEqSelector.cs
@@ -793,7 +793,7 @@ namespace DDUtilityApp.LOGPARSER
///
///
///
- private void Grid_KeyDown(object sender, KeyEventArgs e) //jhlim 20250202
+ private void Grid_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
@@ -806,7 +806,7 @@ namespace DDUtilityApp.LOGPARSER
///
///
///
- private void Grid_CellDoubleClick(object sender, GridViewCellEventArgs e) //jhlim 20250202
+ private void Grid_CellDoubleClick(object sender, GridViewCellEventArgs e)
{
RadGridView gd = sender.GetType().Name.Contains("GridDataCellElement") ?
((GridDataCellElement)sender)?.RowElement?.GridControl : (GridViewEx)sender;
diff --git a/DDUtilityApp/MESDOWNLOADER/ServerLog.cs b/DDUtilityApp/MESDOWNLOADER/ServerLog.cs
index 1016ea9..6d08746 100644
--- a/DDUtilityApp/MESDOWNLOADER/ServerLog.cs
+++ b/DDUtilityApp/MESDOWNLOADER/ServerLog.cs
@@ -1,10 +1,12 @@
using JWH.CONTROL;
using JWH.NETWORK;
+using MongoDB.Driver;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -188,12 +190,21 @@ namespace DDUtilityApp.MESDOWNLOADER
{
if (totalFiles > 1)
{
- Util.GetFileMerge(mergefileList);
+ string filename = Util.GetFileMerge(mergefileList);
MessageBox.Show($"{totalFiles}개의 파일을 머지 하였습니다.");
+ System.Diagnostics.Process.Start(filename);
}
else
{
MessageBox.Show($"{gd.SelectedRows[0].Cells["Name"].Value} 파일을 저장 하였습니다.");
+ string fileName = mergefileList[0];
+ string extension = Path.GetExtension(fileName);
+ if (string.Compare(extension, ".Log", true) != 0)
+ {
+ fileName += ".Log";
+ File.Move(mergefileList[0], fileName);
+ }
+ System.Diagnostics.Process.Start(fileName);
}
}
}
diff --git a/DDUtilityApp/MESDOWNLOADER/Utili.cs b/DDUtilityApp/MESDOWNLOADER/Utili.cs
index b82d3a6..0743b63 100644
--- a/DDUtilityApp/MESDOWNLOADER/Utili.cs
+++ b/DDUtilityApp/MESDOWNLOADER/Utili.cs
@@ -9,14 +9,14 @@ namespace DDUtilityApp.MESDOWNLOADER
{
public static class Util
{
- public static int GetFileMerge(List filePaths)
+ public static string GetFileMerge(List filePaths)
{
- int rtnBint = 9; // 기본 실패 코드
+ string mergedFilePath = string.Empty;
if (filePaths.Count == 0)
{
Console.WriteLine("병합할 파일이 없습니다.");
- return 1;
+ return mergedFilePath;
}
// 실행 시간 측정을 위한 Stopwatch 시작
@@ -26,9 +26,10 @@ namespace DDUtilityApp.MESDOWNLOADER
// 첫 번째 파일명에서 경로 제외
string firstFileName = Path.GetFileName(filePaths.First());
string mergedFileName = "merge_" + firstFileName;
-
// 병합된 파일을 저장할 경로 (첫 번째 파일과 동일한 폴더)
- string mergedFilePath = Path.Combine(Path.GetDirectoryName(filePaths.First()), mergedFileName);
+ mergedFilePath = Path.Combine(Path.GetDirectoryName(filePaths.First()), mergedFileName);
+ string extension = Path.GetExtension(mergedFilePath);
+ if (string.Compare(extension, ".Log", true) != 0) mergedFilePath = mergedFilePath + ".Log";
try
{
@@ -56,14 +57,14 @@ namespace DDUtilityApp.MESDOWNLOADER
Console.WriteLine($"모든 파일이 {mergedFileName}로 병합되었습니다.");
Console.WriteLine($"병합 실행 시간: {stopwatch.ElapsedMilliseconds} ms");
- rtnBint = 0; // 성공 코드
+ return mergedFilePath;
}
catch (Exception ex)
{
Console.WriteLine($"오류 발생: {ex.Message}");
}
- return rtnBint;
+ return mergedFilePath;
}
public static string GetStr(object str )
diff --git a/DDUtilityApp/Program.cs b/DDUtilityApp/Program.cs
index b9b96ef..61978d4 100644
--- a/DDUtilityApp/Program.cs
+++ b/DDUtilityApp/Program.cs
@@ -70,7 +70,7 @@ namespace DDUtilityApp
#region [ 버튼 생성 정보 ]
frmMain.Buttons.Add("EIS Log Viewer", new EisParser0());
- frmMain.Buttons.Add("MES Log Download", typeof(SPECDOCUMENT.FrmSpecDocument));
+ frmMain.Buttons.Add("MES Log Download", typeof(MESDOWNLOADER.ServerLog));
//frmMain.Buttons.Add("MIS Log Viewer", new AgvParser()); // 제거
frmMain.Buttons.Add("FDC Mongo Viewer", typeof(MONGO.FrmFDCMongo));
frmMain.Buttons.Add("HSMS Converter", typeof(LOGPARSER.FrmHsmsViewer));
diff --git a/DDUtilityApp/ViewList.xml b/DDUtilityApp/ViewList.xml
new file mode 100644
index 0000000..5da1c05
--- /dev/null
+++ b/DDUtilityApp/ViewList.xml
@@ -0,0 +1,14 @@
+
+
+
+
+