Merge commit 'b2623b69c41394710be167cf5ffb09c82d1c5c9c'

# Conflicts:
#	ITC81DB_0H/Controls/CenterLog/ControlCenterLogHistory.cs
#	ITC81DB_0H/Controls/CenterLog/ControlCenterLogInspection.cs
#	ITC81DB_0H/Controls/CenterLog/ControlCenterLogOthers.cs
#	ITC81DB_0H/Version.txt
#	ITC81DB_0H/bin/Release/ITC81DB_2H.exe
#	ITC81DB_0H/obj/Release/ITC81DB_2H.exe
master V3.0.1
DESKTOP-999R8N3\CJY 2023-06-23 10:10:18 +09:00
commit 1caa19b906
4 changed files with 7 additions and 0 deletions

View File

@ -1245,6 +1245,8 @@ namespace ITC81DB_0H.Forms
this.ProductChange(this.ParentForm.SystemConfig1.ProductNumber);
// Log - smartFile Close
this.ParentForm.ChildFormMenu.FileClose();
this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable;
if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true)

View File

@ -740,19 +740,24 @@ namespace ITC81DB_0H.Forms
List<string> listSelectedFile = new List<string>(); // 백업할 파일 리스트 (yyyy\\MM\\filename.csv)
this.Q_FileList = new Queue<string>();
this.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.DataBackup, this.SelectedDataType.ToString());
switch (type)
{
case Define.E_DataType.None:
break;
case Define.E_DataType.History:
this.CenterLogHistory.FileClose();
dataFolderPath = this.ParentForm.PathDataHistoryFolder;
this.SelectedDataType = Define.E_DataType.History;
break;
case Define.E_DataType.Inspection:
this.CenterLogInspection.FileClose();
dataFolderPath = this.ParentForm.PathDataInspectionFolder;
this.SelectedDataType = Define.E_DataType.Inspection;
break;
case Define.E_DataType.Others:
this.CenterLogOthers.FileClose();
dataFolderPath = this.ParentForm.PathDataOthersFolder;
this.SelectedDataType = Define.E_DataType.Others;
break;