- DataStore -> Define 추가

- 데이터집계 하한/기준/상한 비율 계산 시 TotalCount 기존 ExNG 수량 제외 -> 포함으로 변경
 - 시리얼통신 -> COM1/COM3/COM4 화면 나눔
 - 이더넷통신 추가

ITC81DB_2/Controls/CenterBasic/ControlCenterBasicTime.Designer.cs

@@ -145,7 +145,7 @@
             this.upDownYear.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right;
             this.upDownYear.TextLabelHeight = 30;
             this.upDownYear.TextLabelWidth = 80;
-            this.upDownYear.TextLocation = new System.Drawing.Point(30, 90);
+            this.upDownYear.TextLocation = new System.Drawing.Point(-37, 90);
             this.upDownYear.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top;
             this.upDownYear.TxtValue = "0000";
             this.upDownYear.Value = ((long)(0));
@@ -218,7 +218,7 @@
             this.upDownMinute.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
             this.upDownMinute.TextLabelHeight = 15;
             this.upDownMinute.TextLabelWidth = 80;
-            this.upDownMinute.TextLocation = new System.Drawing.Point(3, 90);
+            this.upDownMinute.TextLocation = new System.Drawing.Point(-15, 90);
             this.upDownMinute.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top;
             this.upDownMinute.TxtValue = "00";
             this.upDownMinute.Value = ((long)(0));
@@ -291,7 +291,7 @@
             this.upDownHour.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
             this.upDownHour.TextLabelHeight = 15;
             this.upDownHour.TextLabelWidth = 80;
-            this.upDownHour.TextLocation = new System.Drawing.Point(3, 90);
+            this.upDownHour.TextLocation = new System.Drawing.Point(-15, 90);
             this.upDownHour.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top;
             this.upDownHour.TxtValue = "00";
             this.upDownHour.Value = ((long)(0));
@@ -364,7 +364,7 @@
             this.upDownDate.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
             this.upDownDate.TextLabelHeight = 15;
             this.upDownDate.TextLabelWidth = 80;
-            this.upDownDate.TextLocation = new System.Drawing.Point(3, 90);
+            this.upDownDate.TextLocation = new System.Drawing.Point(-15, 90);
             this.upDownDate.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top;
             this.upDownDate.TxtValue = "00";
             this.upDownDate.Value = ((long)(0));
@@ -437,7 +437,7 @@
             this.upDownMonth.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Middle;
             this.upDownMonth.TextLabelHeight = 15;
             this.upDownMonth.TextLabelWidth = 80;
-            this.upDownMonth.TextLocation = new System.Drawing.Point(3, 90);
+            this.upDownMonth.TextLocation = new System.Drawing.Point(-15, 90);
             this.upDownMonth.TextVAlign = SmartX.SmartUpDown.TextVerAlign.Top;
             this.upDownMonth.TxtValue = "00";
             this.upDownMonth.Value = ((long)(0));

ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiEthernet.designer.cs

@@ -895,6 +895,7 @@
             // timerServer
             // 
             this.timerServer.Interval = 1000;
+            this.timerServer.Tick += new System.EventHandler(this.timerServer_Tick);
             // 
             // ControlCenterConfiEthernet
             // 

ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiSerial.cs

@@ -53,6 +53,7 @@ namespace ITC81DB_2.Controls
 
             if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.English)
             {
+                this.labelTitleSelectLane.Text = "Select lane";
                 this.labelTitleOperationMode.Text = "Operation mode";
                 this.labelTitleCommMode.Text = "Communication mode";
                 this.labelTitleSetting.Text = "Setting";
@@ -72,6 +73,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Chinese)
             {
+                this.labelTitleSelectLane.Text = "选择列";
                 this.labelTitleOperationMode.Text = "运转模式";
                 this.labelTitleCommMode.Text = "通信模式";
                 this.labelTitleSetting.Text = "设定值";
@@ -94,6 +96,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Russian)
             {
+                this.labelTitleSelectLane.Text = "Выберите столбец";
                 this.labelTitleOperationMode.Text = "Режим работы";
                 this.labelTitleCommMode.Text = "Режим обмена";
                 this.labelTitleSetting.Text = "Настройка значений";
@@ -113,6 +116,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.German)
             {
+                this.labelTitleSelectLane.Text = "Spalte auswählen";
                 this.labelTitleOperationMode.Text = "Betriebsmodus";
                 this.labelTitleCommMode.Text = "Kommunikationsmodus";
                 this.labelTitleSetting.Text = "Einstellungswert";
@@ -132,6 +136,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Spanish)
             {
+                this.labelTitleSelectLane.Text = "Seleccionar columna";
                 this.labelTitleOperationMode.Text = "Modo de operación";
                 this.labelTitleCommMode.Text = "Modo de comunicación";
                 this.labelTitleSetting.Text = "Setear Valor";
@@ -151,6 +156,7 @@ namespace ITC81DB_2.Controls
             }
             else
             {
+                this.labelTitleSelectLane.Text = "열 선택";
                 this.labelTitleOperationMode.Text = "동작 모드";
                 this.labelTitleCommMode.Text = "통신 모드";
                 this.labelTitleSetting.Text = "설정";
@@ -672,8 +678,8 @@ namespace ITC81DB_2.Controls
             {
                 case Define.E_MenuBottomConfiguration.SerialCOM1:
                     this.ParentForm.ParentForm.CloseSerialCOM1();
-                    this.ParentForm.ParentForm.SystemConfig.SerialCOM1BaudRate = baudrate;
 
+                    this.ParentForm.ParentForm.SystemConfig.SerialCOM1BaudRate = baudrate;
                     this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = mode;
 
                     this.ParentForm.ParentForm.ChangeSerialCOM1FrameSeparateType(Define.E_SeparateType.NONEFRAME_READTIMEOUT);
@@ -681,8 +687,8 @@ namespace ITC81DB_2.Controls
                     break;
                 case Define.E_MenuBottomConfiguration.SerialCOM3:
                     this.ParentForm.ParentForm.CloseSerialCOM3();
-                    this.ParentForm.ParentForm.SystemConfig.SerialCOM3BaudRate = baudrate;
 
+                    this.ParentForm.ParentForm.SystemConfig.SerialCOM3BaudRate = baudrate;
                     this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode = mode;
 
                     this.ParentForm.ParentForm.ChangeSerialCOM3FrameSeparateType(Define.E_SeparateType.NONEFRAME_READTIMEOUT);
@@ -690,8 +696,8 @@ namespace ITC81DB_2.Controls
                     break;
                 case Define.E_MenuBottomConfiguration.SerialCOM4:
                     this.ParentForm.ParentForm.CloseSerialCOM4();
-                    this.ParentForm.ParentForm.SystemConfig.SerialCOM4BaudRate = baudrate;
 
+                    this.ParentForm.ParentForm.SystemConfig.SerialCOM4BaudRate = baudrate;
                     this.ParentForm.ParentForm.SystemConfig.SerialCOM4Mode = mode;
 
                     this.ParentForm.ParentForm.ChangeSerialCOM4FrameSeparateType(Define.E_SeparateType.NONEFRAME_READTIMEOUT);

ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs

@@ -453,7 +453,7 @@ namespace ITC81DB_2.Controls
             splash.Start();
 
             this.ParentForm.ParentForm.ChildFormMainDisplay.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.InitializeDesign();
+            this.ParentForm.InitializeDesign();
             Thread.Sleep(50);
 
             this.ParentForm.ParentForm.ChildFormMainDisplay.MainSubMenu.InitializeDesign();
@@ -465,40 +465,44 @@ namespace ITC81DB_2.Controls
             this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterBasicDataBackup.InitializeDesign();
+            this.ParentForm.CenterBasicDataBackup.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterBasicDataStatistics.InitializeDesign();
+            this.ParentForm.CenterBasicDataStatistics.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterBasicHelp.InitializeDesign();
+            this.ParentForm.CenterBasicHelp.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterBasicProduct.InitializeDesign();
+            this.ParentForm.CenterBasicProduct.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterBasicTime.InitializeDesign();
+            this.ParentForm.CenterBasicTime.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterConfiCommunication.InitializeDesign();
+            this.ParentForm.CenterConfiHelp.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterConfiHelp.InitializeDesign();
+            this.ParentForm.CenterConfiOptionBoard.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterConfiOptionBoard.InitializeDesign();
+            this.ParentForm.CenterConfiSerial.InitializeDesign();
+            this.ParentForm.CenterConfiEthernet.InitializeDesign();
+            this.ParentForm.CenterConfiEthernet.ControlEthernetAddon.InitializeDesign();
+            this.ParentForm.CenterConfiEthernet.ControlEthernetLocalIP.InitializeDesign();
+            this.ParentForm.CenterConfiEthernet.ControlModbusTCP.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipFunctionSetting.InitializeDesign();
+            this.ParentForm.CenterEquipFunctionSetting.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipHelp.InitializeDesign();
+            this.ParentForm.CenterEquipHelp.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipInitialize.InitializeDesign();
+            this.ParentForm.CenterEquipInitialize.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUpdate.InitializeDesign();
+            this.ParentForm.CenterEquipUpdate.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUser.InitializeDesign();
+            this.ParentForm.CenterEquipUser.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterEquipEngineer.InitializeDesign();
+            this.ParentForm.CenterEquipEngineer.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterInforAS.InitializeDesign();
+            this.ParentForm.CenterInforAS.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterInforHelp.InitializeDesign();
+            this.ParentForm.CenterInforHelp.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterInforSystemInformation.InitializeDesign();
+            this.ParentForm.CenterInforSystemInformation.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemAutoZero.InitializeDesign();
+            this.ParentForm.CenterSystemAutoZero.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemCalibration.InitializeDesign();
+            this.ParentForm.CenterSystemCalibration.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemHelp.InitializeDesign();
+            this.ParentForm.CenterSystemHelp.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemIOTest.InitializeDesign();
+            this.ParentForm.CenterSystemIOTest.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemJudgmentSetting.InitializeDesign();
+            this.ParentForm.CenterSystemJudgmentSetting.InitializeDesign();
-            this.ParentForm.ParentForm.ChildFormMenu.CenterSystemSorterSetting.InitializeDesign();
+            this.ParentForm.CenterSystemSorterSetting.InitializeDesign();
             Thread.Sleep(50);
 
-            this.ParentForm.ParentForm.ChildFormMenu.CenterInforAS.DefaultSetting();
+            this.ParentForm.CenterInforAS.DefaultSetting();
 
             splash.Finish();
         }

ITC81DB_2/Controls/Etc/ControlConfiEthernetAddon.cs

@@ -46,6 +46,7 @@ namespace ITC81DB_2.Controls
 
             if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.English)
             {
+                this.labelTitleSelectLane.Text = "Select lane";
                 this.labelTitleAddon.Text = "Add-on";
                 this.labelTitleTransmissionDelayTime.Text = "Transmission delay time(ms)";
                 //this.labelTitleCommControlCharacter.Text = "Com- control character";
@@ -57,6 +58,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Chinese)
             {
+                this.labelTitleSelectLane.Text = "选择列";
                 this.labelTitleAddon.Text = "附加功能";
                 this.labelTitleTransmissionDelayTime.Text = "传送延迟时间(ms)";
                 //this.labelTitleCommControlCharacter.Text = "通信制御文字";
@@ -71,6 +73,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Russian)
             {
+                this.labelTitleSelectLane.Text = "Выберите столбец";
                 this.labelTitleAddon.Text = "Дополнения";
                 this.labelTitleTransmissionDelayTime.Text = "Время задержки передачи(ms)";
                 //this.labelTitleCommControlCharacter.Text = "Коммуникационный управляющий персонаж";
@@ -83,6 +86,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.German)
             {
+                this.labelTitleSelectLane.Text = "Spalte auswählen";
                 this.labelTitleAddon.Text = "Erweiterung";
                 this.labelTitleTransmissionDelayTime.Text = "Übertragungsverzögerungszeit(ms)";
                 //this.labelTitleCommControlCharacter.Text = "Kommunikationssteuerungszeichen";
@@ -94,6 +98,7 @@ namespace ITC81DB_2.Controls
             }
             else if (this.ParentForm.ParentForm.SystemConfig.Language == Define.E_LanguageID.Spanish)
             {
+                this.labelTitleSelectLane.Text = "Seleccionar columna";
                 this.labelTitleAddon.Text = "Complementos";
                 this.labelTitleTransmissionDelayTime.Text = "Tiempo de retardo de transmisión(ms)";
                 //this.labelTitleCommControlCharacter.Text = "Carácter de control de comm";
@@ -105,6 +110,7 @@ namespace ITC81DB_2.Controls
             }
             else
             {
+                this.labelTitleSelectLane.Text = "열 선택";
                 this.labelTitleAddon.Text = "추가설정";
                 this.labelTitleTransmissionDelayTime.Text = "전송 지연시간(ms)";
                 //this.labelTitleCommControlCharacter.Text = "통신 제어 문자";
@@ -117,7 +123,13 @@ namespace ITC81DB_2.Controls
         }
         private void DefaultSetting()
         {
-
+            this.comboBoxSelectLane.Items.Clear();
+            this.comboBoxSelectLane.SelectedIndexChanged -= new EventHandler(this.comboBoxSelectLane_SelectedIndexChanged);
+            this.comboBoxSelectLane.Items.Add("All");
+            this.comboBoxSelectLane.Items.Add("1");
+            this.comboBoxSelectLane.Items.Add("2");
+            this.comboBoxSelectLane.SelectedIndex = 0;
+            this.comboBoxSelectLane.SelectedIndexChanged += new EventHandler(this.comboBoxSelectLane_SelectedIndexChanged);
         }
 
         private void UpdateSerialParameterDisplay(SystemConfigurationItem item)

ITC81DB_2/Forms/FormMain.cs

@@ -8310,6 +8310,7 @@ namespace ITC81DB_2.Forms
 
             // SystemConfiguration 파일 읽기
             this.LoadSystemConfigurationFile1();
+            this.LoadSystemConfigurationFile2();
             Thread.Sleep(50);
 
             // Counter 파일 읽기
@@ -8349,10 +8350,12 @@ namespace ITC81DB_2.Forms
 
             // 메인 통신 OPEN
             this.OpenSmartUartLink();
-            // CH1 OPEN
+            // COM1 OPEN
             this.OpenSerialCOM1();
-            // CH2 OPEN
+            // COM3 OPEN
             this.OpenSerialCOM3();
+            // COM4 OPEN
+            this.OpenSerialCOM4();
             // Read SystemParameter1
             this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9507_SystemParameterRead, "");
 

ITC81DB_2/Forms/FormMainDisplay.cs

@@ -414,6 +414,18 @@ namespace ITC81DB_2.Forms
                 this.pictureBoxCOM3Disable.Visible = false;
             }
 
+            // Icon - COM4
+            if (this.ParentForm.SystemConfig.SerialCOM4Mode == 0)
+            {
+                this.pictureBoxCOM4Enable.Visible = false;
+                this.pictureBoxCOM4Disable.Visible = true;
+            }
+            else
+            {
+                this.pictureBoxCOM4Enable.Visible = true;
+                this.pictureBoxCOM4Disable.Visible = false;
+            }
+
             // Icon - Feedback
             if (this.MainFeedback.IsUsingFeedback() == true) // Feedback
             {