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.exemaster V3.0.1
commit
1caa19b906
|
@ -1245,6 +1245,8 @@ namespace ITC81DB_0H.Forms
|
||||||
|
|
||||||
this.ProductChange(this.ParentForm.SystemConfig1.ProductNumber);
|
this.ProductChange(this.ParentForm.SystemConfig1.ProductNumber);
|
||||||
|
|
||||||
|
// Log - smartFile Close
|
||||||
|
this.ParentForm.ChildFormMenu.FileClose();
|
||||||
this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable;
|
this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable;
|
||||||
|
|
||||||
if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true)
|
if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true)
|
||||||
|
|
|
@ -740,19 +740,24 @@ namespace ITC81DB_0H.Forms
|
||||||
List<string> listSelectedFile = new List<string>(); // 백업할 파일 리스트 (yyyy\\MM\\filename.csv)
|
List<string> listSelectedFile = new List<string>(); // 백업할 파일 리스트 (yyyy\\MM\\filename.csv)
|
||||||
this.Q_FileList = new Queue<string>();
|
this.Q_FileList = new Queue<string>();
|
||||||
|
|
||||||
|
this.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.DataBackup, this.SelectedDataType.ToString());
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case Define.E_DataType.None:
|
case Define.E_DataType.None:
|
||||||
break;
|
break;
|
||||||
case Define.E_DataType.History:
|
case Define.E_DataType.History:
|
||||||
|
this.CenterLogHistory.FileClose();
|
||||||
dataFolderPath = this.ParentForm.PathDataHistoryFolder;
|
dataFolderPath = this.ParentForm.PathDataHistoryFolder;
|
||||||
this.SelectedDataType = Define.E_DataType.History;
|
this.SelectedDataType = Define.E_DataType.History;
|
||||||
break;
|
break;
|
||||||
case Define.E_DataType.Inspection:
|
case Define.E_DataType.Inspection:
|
||||||
|
this.CenterLogInspection.FileClose();
|
||||||
dataFolderPath = this.ParentForm.PathDataInspectionFolder;
|
dataFolderPath = this.ParentForm.PathDataInspectionFolder;
|
||||||
this.SelectedDataType = Define.E_DataType.Inspection;
|
this.SelectedDataType = Define.E_DataType.Inspection;
|
||||||
break;
|
break;
|
||||||
case Define.E_DataType.Others:
|
case Define.E_DataType.Others:
|
||||||
|
this.CenterLogOthers.FileClose();
|
||||||
dataFolderPath = this.ParentForm.PathDataOthersFolder;
|
dataFolderPath = this.ParentForm.PathDataOthersFolder;
|
||||||
this.SelectedDataType = Define.E_DataType.Others;
|
this.SelectedDataType = Define.E_DataType.Others;
|
||||||
break;
|
break;
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue