diff --git a/ITC81DB_0H/Controls/CenterBasic/ControlCenterBasicDataBackup.cs b/ITC81DB_0H/Controls/CenterBasic/ControlCenterBasicDataBackup.cs index ae8b464..87f7cb5 100644 --- a/ITC81DB_0H/Controls/CenterBasic/ControlCenterBasicDataBackup.cs +++ b/ITC81DB_0H/Controls/CenterBasic/ControlCenterBasicDataBackup.cs @@ -135,7 +135,7 @@ namespace ITC81DB_0H.Controls foreach (FileInfo file in files) { - if (file.Name.StartsWith("20") == true || file.Name.StartsWith("Communicationlog") == true || file.Name.EndsWith(".jpg") == true) + if (file.Name.StartsWith("20") == true || file.Name.StartsWith("Communicationlog") == true || file.Name.EndsWith(".jpg") == true || file.Name.EndsWith(".txt") == true) this.listBoxDataList.Items.Add(file.Name); } @@ -245,7 +245,7 @@ namespace ITC81DB_0H.Controls foreach (FileInfo file in files) { if (file.Name.StartsWith("20") == true || file.Name.StartsWith("Communicationlog") == true - || file.Name.EndsWith(".jpg") == true) + || file.Name.EndsWith(".jpg") == true || file.Name.EndsWith(".txt") == true) { this.FileCopy(file, filePath + file.Name); diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.Designer.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.Designer.cs index 8704a66..9ee4a6c 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.Designer.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.Designer.cs @@ -100,7 +100,7 @@ this.labelConveyorLength.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelConveyorLength.InitVisible = true; this.labelConveyorLength.LineSpacing = 0F; - this.labelConveyorLength.Location = new System.Drawing.Point(401, 118); + this.labelConveyorLength.Location = new System.Drawing.Point(381, 129); this.labelConveyorLength.Name = "labelConveyorLength"; this.labelConveyorLength.Size = new System.Drawing.Size(120, 28); this.labelConveyorLength.TabIndex = 208; @@ -121,9 +121,9 @@ this.labelTitleConveyorLength.ForeColor = System.Drawing.Color.White; this.labelTitleConveyorLength.InitVisible = true; this.labelTitleConveyorLength.LineSpacing = 0F; - this.labelTitleConveyorLength.Location = new System.Drawing.Point(130, 118); + this.labelTitleConveyorLength.Location = new System.Drawing.Point(115, 129); this.labelTitleConveyorLength.Name = "labelTitleConveyorLength"; - this.labelTitleConveyorLength.Size = new System.Drawing.Size(265, 28); + this.labelTitleConveyorLength.Size = new System.Drawing.Size(260, 28); this.labelTitleConveyorLength.TabIndex = 207; this.labelTitleConveyorLength.Text = "컨베어 길이"; this.labelTitleConveyorLength.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -134,7 +134,7 @@ // comboBoxStatisticsPrintFormat // this.comboBoxStatisticsPrintFormat.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxStatisticsPrintFormat.Location = new System.Drawing.Point(401, 274); + this.comboBoxStatisticsPrintFormat.Location = new System.Drawing.Point(381, 289); this.comboBoxStatisticsPrintFormat.Name = "comboBoxStatisticsPrintFormat"; this.comboBoxStatisticsPrintFormat.Size = new System.Drawing.Size(120, 28); this.comboBoxStatisticsPrintFormat.TabIndex = 206; @@ -150,9 +150,9 @@ this.labelTitleStatPrintFormat.ForeColor = System.Drawing.Color.White; this.labelTitleStatPrintFormat.InitVisible = true; this.labelTitleStatPrintFormat.LineSpacing = 0F; - this.labelTitleStatPrintFormat.Location = new System.Drawing.Point(130, 274); + this.labelTitleStatPrintFormat.Location = new System.Drawing.Point(115, 289); this.labelTitleStatPrintFormat.Name = "labelTitleStatPrintFormat"; - this.labelTitleStatPrintFormat.Size = new System.Drawing.Size(265, 28); + this.labelTitleStatPrintFormat.Size = new System.Drawing.Size(260, 28); this.labelTitleStatPrintFormat.TabIndex = 205; this.labelTitleStatPrintFormat.Text = "데이터집계 출력 포맷"; this.labelTitleStatPrintFormat.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -162,7 +162,7 @@ // comboBoxFilenameExtension // this.comboBoxFilenameExtension.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxFilenameExtension.Location = new System.Drawing.Point(401, 206); + this.comboBoxFilenameExtension.Location = new System.Drawing.Point(381, 221); this.comboBoxFilenameExtension.Name = "comboBoxFilenameExtension"; this.comboBoxFilenameExtension.Size = new System.Drawing.Size(120, 28); this.comboBoxFilenameExtension.TabIndex = 204; @@ -178,9 +178,9 @@ this.labelTitleFileNameExtension.ForeColor = System.Drawing.Color.White; this.labelTitleFileNameExtension.InitVisible = true; this.labelTitleFileNameExtension.LineSpacing = 0F; - this.labelTitleFileNameExtension.Location = new System.Drawing.Point(130, 206); + this.labelTitleFileNameExtension.Location = new System.Drawing.Point(115, 221); this.labelTitleFileNameExtension.Name = "labelTitleFileNameExtension"; - this.labelTitleFileNameExtension.Size = new System.Drawing.Size(265, 28); + this.labelTitleFileNameExtension.Size = new System.Drawing.Size(260, 28); this.labelTitleFileNameExtension.TabIndex = 203; this.labelTitleFileNameExtension.Text = "데이터백업 확장자"; this.labelTitleFileNameExtension.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -197,9 +197,9 @@ this.labelTitleBarcode.ForeColor = System.Drawing.Color.White; this.labelTitleBarcode.InitVisible = true; this.labelTitleBarcode.LineSpacing = 0F; - this.labelTitleBarcode.Location = new System.Drawing.Point(130, 308); + this.labelTitleBarcode.Location = new System.Drawing.Point(115, 323); this.labelTitleBarcode.Name = "labelTitleBarcode"; - this.labelTitleBarcode.Size = new System.Drawing.Size(265, 28); + this.labelTitleBarcode.Size = new System.Drawing.Size(260, 28); this.labelTitleBarcode.TabIndex = 202; this.labelTitleBarcode.Text = "바코드"; this.labelTitleBarcode.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -218,7 +218,7 @@ this.buttonBarcode.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBarcode.DownImage"))); this.buttonBarcode.GroupID = 0; this.buttonBarcode.InitVisible = true; - this.buttonBarcode.Location = new System.Drawing.Point(401, 308); + this.buttonBarcode.Location = new System.Drawing.Point(381, 323); this.buttonBarcode.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonBarcode.Name = "buttonBarcode"; this.buttonBarcode.NestedClickEventPrevent = false; @@ -240,7 +240,7 @@ // comboBoxDataBackupFormat // this.comboBoxDataBackupFormat.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxDataBackupFormat.Location = new System.Drawing.Point(401, 240); + this.comboBoxDataBackupFormat.Location = new System.Drawing.Point(381, 255); this.comboBoxDataBackupFormat.Name = "comboBoxDataBackupFormat"; this.comboBoxDataBackupFormat.Size = new System.Drawing.Size(120, 28); this.comboBoxDataBackupFormat.TabIndex = 200; @@ -256,9 +256,9 @@ this.labelTitleDataBackupFormat.ForeColor = System.Drawing.Color.White; this.labelTitleDataBackupFormat.InitVisible = true; this.labelTitleDataBackupFormat.LineSpacing = 0F; - this.labelTitleDataBackupFormat.Location = new System.Drawing.Point(130, 240); + this.labelTitleDataBackupFormat.Location = new System.Drawing.Point(115, 255); this.labelTitleDataBackupFormat.Name = "labelTitleDataBackupFormat"; - this.labelTitleDataBackupFormat.Size = new System.Drawing.Size(265, 28); + this.labelTitleDataBackupFormat.Size = new System.Drawing.Size(260, 28); this.labelTitleDataBackupFormat.TabIndex = 199; this.labelTitleDataBackupFormat.Text = "데이터백업 포맷"; this.labelTitleDataBackupFormat.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -268,7 +268,7 @@ // comboBoxOptionBoard // this.comboBoxOptionBoard.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxOptionBoard.Location = new System.Drawing.Point(401, 172); + this.comboBoxOptionBoard.Location = new System.Drawing.Point(381, 187); this.comboBoxOptionBoard.Name = "comboBoxOptionBoard"; this.comboBoxOptionBoard.Size = new System.Drawing.Size(120, 28); this.comboBoxOptionBoard.TabIndex = 198; @@ -285,9 +285,9 @@ this.labelTitleOptionBoard.ForeColor = System.Drawing.Color.White; this.labelTitleOptionBoard.InitVisible = true; this.labelTitleOptionBoard.LineSpacing = 0F; - this.labelTitleOptionBoard.Location = new System.Drawing.Point(130, 172); + this.labelTitleOptionBoard.Location = new System.Drawing.Point(115, 187); this.labelTitleOptionBoard.Name = "labelTitleOptionBoard"; - this.labelTitleOptionBoard.Size = new System.Drawing.Size(265, 28); + this.labelTitleOptionBoard.Size = new System.Drawing.Size(260, 28); this.labelTitleOptionBoard.TabIndex = 197; this.labelTitleOptionBoard.Text = "옵션보드"; this.labelTitleOptionBoard.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -305,9 +305,9 @@ this.labelTitleCommunicationOption.ForeColor = System.Drawing.Color.White; this.labelTitleCommunicationOption.InitVisible = true; this.labelTitleCommunicationOption.LineSpacing = 0F; - this.labelTitleCommunicationOption.Location = new System.Drawing.Point(130, 84); + this.labelTitleCommunicationOption.Location = new System.Drawing.Point(115, 95); this.labelTitleCommunicationOption.Name = "labelTitleCommunicationOption"; - this.labelTitleCommunicationOption.Size = new System.Drawing.Size(265, 28); + this.labelTitleCommunicationOption.Size = new System.Drawing.Size(260, 28); this.labelTitleCommunicationOption.TabIndex = 196; this.labelTitleCommunicationOption.Text = "통신모드 옵션 사용"; this.labelTitleCommunicationOption.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -326,7 +326,7 @@ this.buttonCommunicationOption.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCommunicationOption.DownImage"))); this.buttonCommunicationOption.GroupID = 0; this.buttonCommunicationOption.InitVisible = true; - this.buttonCommunicationOption.Location = new System.Drawing.Point(401, 84); + this.buttonCommunicationOption.Location = new System.Drawing.Point(381, 95); this.buttonCommunicationOption.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonCommunicationOption.Name = "buttonCommunicationOption"; this.buttonCommunicationOption.NestedClickEventPrevent = false; @@ -348,7 +348,7 @@ // comboBoxEquipmentType // this.comboBoxEquipmentType.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxEquipmentType.Location = new System.Drawing.Point(401, 50); + this.comboBoxEquipmentType.Location = new System.Drawing.Point(381, 61); this.comboBoxEquipmentType.Name = "comboBoxEquipmentType"; this.comboBoxEquipmentType.Size = new System.Drawing.Size(180, 28); this.comboBoxEquipmentType.TabIndex = 190; @@ -447,9 +447,9 @@ this.labelTitleEquipmentType.ForeColor = System.Drawing.Color.White; this.labelTitleEquipmentType.InitVisible = true; this.labelTitleEquipmentType.LineSpacing = 0F; - this.labelTitleEquipmentType.Location = new System.Drawing.Point(130, 50); + this.labelTitleEquipmentType.Location = new System.Drawing.Point(115, 61); this.labelTitleEquipmentType.Name = "labelTitleEquipmentType"; - this.labelTitleEquipmentType.Size = new System.Drawing.Size(265, 28); + this.labelTitleEquipmentType.Size = new System.Drawing.Size(260, 28); this.labelTitleEquipmentType.TabIndex = 117; this.labelTitleEquipmentType.Text = "장비타입"; this.labelTitleEquipmentType.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs index 0cff831..0aa872f 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs @@ -524,6 +524,5 @@ namespace ITC81DB_0H.Controls } } #endregion - } } diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.Designer.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.Designer.cs index 74cc699..24aae2a 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.Designer.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.Designer.cs @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterEquipUpdate)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.ButtonLCD = new SmartX.SmartButton(); + this.buttonLCD = new SmartX.SmartButton(); this.buttonMainBoard = new SmartX.SmartButton(); this.labelMessage2 = new SmartX.SmartLabel(); this.labelMessage1 = new SmartX.SmartLabel(); @@ -44,7 +44,7 @@ this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; - this.smartGroupBox1.Controls.Add(this.ButtonLCD); + this.smartGroupBox1.Controls.Add(this.buttonLCD); this.smartGroupBox1.Controls.Add(this.buttonMainBoard); this.smartGroupBox1.Controls.Add(this.labelMessage2); this.smartGroupBox1.Controls.Add(this.labelMessage1); @@ -62,38 +62,38 @@ this.smartGroupBox1.TabIndex = 176; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // - // ButtonLCD + // buttonLCD // - this.ButtonLCD.BackPictureBox = null; - this.ButtonLCD.BackPictureBox1 = null; - this.ButtonLCD.BackPictureBox2 = null; - this.ButtonLCD.ButtonColor = System.Drawing.Color.Gray; - this.ButtonLCD.ButtonImageAutoSize = true; - this.ButtonLCD.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.ButtonLCD.DisableImage = ((System.Drawing.Image)(resources.GetObject("ButtonLCD.DisableImage"))); - this.ButtonLCD.DownImage = ((System.Drawing.Image)(resources.GetObject("ButtonLCD.DownImage"))); - this.ButtonLCD.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); - this.ButtonLCD.GroupID = 0; - this.ButtonLCD.InitVisible = true; - this.ButtonLCD.Location = new System.Drawing.Point(360, 298); - this.ButtonLCD.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.ButtonLCD.Name = "ButtonLCD"; - this.ButtonLCD.NestedClickEventPrevent = false; - this.ButtonLCD.OutlinePixel = 1; - this.ButtonLCD.RepeatInterval = 200; - this.ButtonLCD.RepeatIntervalAccelerate = null; - this.ButtonLCD.SafeInterval = 200; - this.ButtonLCD.Size = new System.Drawing.Size(200, 50); - this.ButtonLCD.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.ButtonLCD.TabIndex = 24; - this.ButtonLCD.Text = "LCD"; - this.ButtonLCD.TextColor = System.Drawing.Color.White; - this.ButtonLCD.TextDownColor = System.Drawing.Color.White; - this.ButtonLCD.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.ButtonLCD.TextLocation = new System.Drawing.Point(0, 0); - this.ButtonLCD.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.ButtonLCD.UpImage = ((System.Drawing.Image)(resources.GetObject("ButtonLCD.UpImage"))); - this.ButtonLCD.Click += new System.EventHandler(this.ButtonLCD_Click); + this.buttonLCD.BackPictureBox = null; + this.buttonLCD.BackPictureBox1 = null; + this.buttonLCD.BackPictureBox2 = null; + this.buttonLCD.ButtonColor = System.Drawing.Color.Gray; + this.buttonLCD.ButtonImageAutoSize = true; + this.buttonLCD.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLCD.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLCD.DisableImage"))); + this.buttonLCD.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLCD.DownImage"))); + this.buttonLCD.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); + this.buttonLCD.GroupID = 0; + this.buttonLCD.InitVisible = true; + this.buttonLCD.Location = new System.Drawing.Point(360, 298); + this.buttonLCD.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonLCD.Name = "buttonLCD"; + this.buttonLCD.NestedClickEventPrevent = false; + this.buttonLCD.OutlinePixel = 1; + this.buttonLCD.RepeatInterval = 200; + this.buttonLCD.RepeatIntervalAccelerate = null; + this.buttonLCD.SafeInterval = 200; + this.buttonLCD.Size = new System.Drawing.Size(200, 50); + this.buttonLCD.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLCD.TabIndex = 24; + this.buttonLCD.Text = "LCD"; + this.buttonLCD.TextColor = System.Drawing.Color.White; + this.buttonLCD.TextDownColor = System.Drawing.Color.White; + this.buttonLCD.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLCD.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLCD.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLCD.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLCD.UpImage"))); + this.buttonLCD.Click += new System.EventHandler(this.ButtonLCD_Click); // // buttonMainBoard // @@ -197,6 +197,7 @@ // timerForMainBoard // this.timerForMainBoard.Interval = 1000; + this.timerForMainBoard.Tick += new System.EventHandler(this.timerForMainBoard_Tick); // // ControlCenterEquipUpdate // @@ -217,7 +218,7 @@ public SmartX.SmartLabel labelMessage2; public SmartX.SmartLabel labelMessage1; public SmartX.SmartProgressBar progressBarUpdate; - private SmartX.SmartButton ButtonLCD; + private SmartX.SmartButton buttonLCD; private SmartX.SmartButton buttonMainBoard; private System.Windows.Forms.Timer timerForMainBoard; } diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs index c3f1cb8..d9c7b46 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs @@ -240,8 +240,6 @@ namespace ITC81DB_0H.Controls this.TreatmentCopyNewFile(newFiles); - this.progressBarUpdate.Value += 100; - this.ParentForm.Enabled = false; this.UpdateStep = DataStore.Step3.Step3; @@ -284,6 +282,10 @@ namespace ITC81DB_0H.Controls long a = 0; int count = 0, byteCount = 0; + this.ParentForm.Enabled = false; + this.buttonMainBoard.Enabled = false; + this.buttonLCD.Enabled = false; + FileStream fs = new FileStream(this.UpdateFilePath, FileMode.Open, FileAccess.Read); BinaryReader br = new BinaryReader(fs); @@ -294,6 +296,9 @@ namespace ITC81DB_0H.Controls count = byteCount / 100; this.ParentForm.ParentForm.UpdateForMain.SendDataCount = count; + this.UpdateStep = DataStore.Step3.Step2; + this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); + this.timerForMainBoard.Enabled = true; } public void SetProgressBarValue(int value) @@ -301,10 +306,50 @@ namespace ITC81DB_0H.Controls this.progressBarUpdate.Value += value; } - public void UpdateMainBoardFail() + public void UpdateMainBoardFail(DataStore.LanguageID language) { - this.labelMessage1.Text = "Update Fail!"; - this.labelMessage2.Text = "Please Check your MainBoard"; + this.ParentForm.Enabled = false; + + switch (language) + { + case DataStore.LanguageID.Korean: + this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage1.Text = "업데이트가 실패하였습니다."; + this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage2.Text = "메인보드를 체크해 주시기 바랍니다."; + break; + case DataStore.LanguageID.English: + this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage1.Text = "Update Fail!"; + this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage2.Text = "Please Check your MainBoard"; + break; + case DataStore.LanguageID.Chinese: + this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage1.Text = "更新失败！"; + this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular); + this.labelMessage2.Text = "请检查您的主板"; + break; + case DataStore.LanguageID.German: + this.labelMessage1.Font = new Font("새굴림", 12, FontStyle.Regular); + this.labelMessage1.Text = "Update fehlgeschlagen!"; + this.labelMessage2.Font = new Font("새굴림", 12, FontStyle.Regular); + this.labelMessage2.Text = "Bitte überprüfen Sie Ihr MainBoard"; + break; + case DataStore.LanguageID.Russian: + this.labelMessage1.Font = new Font("새굴림", 12, FontStyle.Regular); + this.labelMessage1.Text = "Ошибка обновления!"; + this.labelMessage2.Font = new Font("새굴림", 12, FontStyle.Regular); + this.labelMessage2.Text = "Пожалуйста, проверьте свою главную доску"; + break; + default: + break; + } + } + public void UpdateMainBoardFinish() + { + this.UpdateStep = DataStore.Step3.Step3; + this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); } private void UpdateLabelStatus(DataStore.Step3 step, DataStore.LanguageID language) { @@ -427,6 +472,8 @@ namespace ITC81DB_0H.Controls break; } #endregion + this.progressBarUpdate.Value = 100; + break; default: break; @@ -445,7 +492,7 @@ namespace ITC81DB_0H.Controls if (check == DataStore.UpdateCheck.Success) { this.buttonMainBoard.Enabled = false; - this.ButtonLCD.Enabled = false; + this.buttonLCD.Enabled = false; this.UpdateStep = DataStore.Step3.Step2; this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.resx b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.resx index ee21b10..38fbff3 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.resx +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAYAAAAZUZThAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -177,7 +177,7 @@ 7p/mvT1ArQAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAYAAAAZUZThAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -264,7 +264,7 @@ mDvXOKkDGo0G/wcEB5qkUo3SkQAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAYAAAAZUZThAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -646,7 +646,10 @@ - 418, 17 + 404, 11 + + + 45 WEBPAD diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs index 1fb6eab..0b66ab2 100644 --- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber; - this.labelDisplayVer.Text = "1.0.0"; + this.labelDisplayVer.Text = "1.0.1"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemExternalOutput.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemExternalOutput.cs index 06b5295..e8dbf52 100644 --- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemExternalOutput.cs +++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemExternalOutput.cs @@ -58,10 +58,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter1Mode.Items.Add("Pass"); this.comboBoxSorter1Mode.Items.Add("Run"); this.comboBoxSorter1Mode.Items.Add("Count"); - this.comboBoxSorter1Mode.Items.Add("Counting output1"); - this.comboBoxSorter1Mode.Items.Add("Counting output2"); - this.comboBoxSorter1Mode.Items.Add("ExNG"); - this.comboBoxSorter1Mode.Items.Add("Latch control"); + //this.comboBoxSorter1Mode.Items.Add("Counting output1"); + //this.comboBoxSorter1Mode.Items.Add("Counting output2"); + //this.comboBoxSorter1Mode.Items.Add("ExNG"); + //this.comboBoxSorter1Mode.Items.Add("Latch control"); this.comboBoxSorter1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); @@ -73,10 +73,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter2Mode.Items.Add("Pass"); this.comboBoxSorter2Mode.Items.Add("Run"); this.comboBoxSorter2Mode.Items.Add("Count"); - this.comboBoxSorter2Mode.Items.Add("Counting output1"); - this.comboBoxSorter2Mode.Items.Add("Counting output2"); - this.comboBoxSorter2Mode.Items.Add("ExNG"); - this.comboBoxSorter2Mode.Items.Add("Latch control"); + //this.comboBoxSorter2Mode.Items.Add("Counting output1"); + //this.comboBoxSorter2Mode.Items.Add("Counting output2"); + //this.comboBoxSorter2Mode.Items.Add("ExNG"); + //this.comboBoxSorter2Mode.Items.Add("Latch control"); this.comboBoxSorter2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); this.comboBoxSorter3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); @@ -88,10 +88,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter3Mode.Items.Add("Pass"); this.comboBoxSorter3Mode.Items.Add("Run"); this.comboBoxSorter3Mode.Items.Add("Count"); - this.comboBoxSorter3Mode.Items.Add("Counting output1"); - this.comboBoxSorter3Mode.Items.Add("Counting output2"); - this.comboBoxSorter3Mode.Items.Add("ExNG"); - this.comboBoxSorter3Mode.Items.Add("Latch control"); + //this.comboBoxSorter3Mode.Items.Add("Counting output1"); + //this.comboBoxSorter3Mode.Items.Add("Counting output2"); + //this.comboBoxSorter3Mode.Items.Add("ExNG"); + //this.comboBoxSorter3Mode.Items.Add("Latch control"); this.comboBoxSorter3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); this.comboBoxSorter4Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); @@ -103,10 +103,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter4Mode.Items.Add("Pass"); this.comboBoxSorter4Mode.Items.Add("Run"); this.comboBoxSorter4Mode.Items.Add("Count"); - this.comboBoxSorter4Mode.Items.Add("Counting output1"); - this.comboBoxSorter4Mode.Items.Add("Counting output2"); - this.comboBoxSorter4Mode.Items.Add("ExNG"); - this.comboBoxSorter4Mode.Items.Add("Latch control"); + //this.comboBoxSorter4Mode.Items.Add("Counting output1"); + //this.comboBoxSorter4Mode.Items.Add("Counting output2"); + //this.comboBoxSorter4Mode.Items.Add("ExNG"); + //this.comboBoxSorter4Mode.Items.Add("Latch control"); this.comboBoxSorter4Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); this.comboBoxSorter5Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); @@ -118,9 +118,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter5Mode.Items.Add("Pass"); this.comboBoxSorter5Mode.Items.Add("Run"); this.comboBoxSorter5Mode.Items.Add("Count"); - this.comboBoxSorter5Mode.Items.Add("Counting output1"); - this.comboBoxSorter5Mode.Items.Add("Counting output2"); - this.comboBoxSorter5Mode.Items.Add("ExNG"); + //this.comboBoxSorter5Mode.Items.Add("Counting output1"); + //this.comboBoxSorter5Mode.Items.Add("Counting output2"); + //this.comboBoxSorter5Mode.Items.Add("ExNG"); this.comboBoxSorter5Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); this.comboBoxSorter6Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); @@ -132,9 +132,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter6Mode.Items.Add("Pass"); this.comboBoxSorter6Mode.Items.Add("Run"); this.comboBoxSorter6Mode.Items.Add("Count"); - this.comboBoxSorter6Mode.Items.Add("Counting output1"); - this.comboBoxSorter6Mode.Items.Add("Counting output2"); - this.comboBoxSorter6Mode.Items.Add("ExNG"); + //this.comboBoxSorter6Mode.Items.Add("Counting output1"); + //this.comboBoxSorter6Mode.Items.Add("Counting output2"); + //this.comboBoxSorter6Mode.Items.Add("ExNG"); this.comboBoxSorter6Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); #endregion } @@ -152,10 +152,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter1Mode.Items.Add("通过"); this.comboBoxSorter1Mode.Items.Add("运行"); this.comboBoxSorter1Mode.Items.Add("计数"); - this.comboBoxSorter1Mode.Items.Add("计数输出1"); - this.comboBoxSorter1Mode.Items.Add("计数输出2"); - this.comboBoxSorter1Mode.Items.Add("其他不良"); - this.comboBoxSorter1Mode.Items.Add("闩锁控制"); + //this.comboBoxSorter1Mode.Items.Add("计数输出1"); + //this.comboBoxSorter1Mode.Items.Add("计数输出2"); + //this.comboBoxSorter1Mode.Items.Add("其他不良"); + //this.comboBoxSorter1Mode.Items.Add("闩锁控制"); this.comboBoxSorter1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); @@ -167,10 +167,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter2Mode.Items.Add("通过"); this.comboBoxSorter2Mode.Items.Add("运行"); this.comboBoxSorter2Mode.Items.Add("计数"); - this.comboBoxSorter2Mode.Items.Add("计数输出1"); - this.comboBoxSorter2Mode.Items.Add("计数输出2"); - this.comboBoxSorter2Mode.Items.Add("其他不良"); - this.comboBoxSorter2Mode.Items.Add("闩锁控制"); + //this.comboBoxSorter2Mode.Items.Add("计数输出1"); + //this.comboBoxSorter2Mode.Items.Add("计数输出2"); + //this.comboBoxSorter2Mode.Items.Add("其他不良"); + //this.comboBoxSorter2Mode.Items.Add("闩锁控制"); this.comboBoxSorter2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); this.comboBoxSorter3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); @@ -182,10 +182,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter3Mode.Items.Add("通过"); this.comboBoxSorter3Mode.Items.Add("运行"); this.comboBoxSorter3Mode.Items.Add("计数"); - this.comboBoxSorter3Mode.Items.Add("计数输出1"); - this.comboBoxSorter3Mode.Items.Add("计数输出2"); - this.comboBoxSorter3Mode.Items.Add("其他不良"); - this.comboBoxSorter3Mode.Items.Add("闩锁控制"); + //this.comboBoxSorter3Mode.Items.Add("计数输出1"); + //this.comboBoxSorter3Mode.Items.Add("计数输出2"); + //this.comboBoxSorter3Mode.Items.Add("其他不良"); + //this.comboBoxSorter3Mode.Items.Add("闩锁控制"); this.comboBoxSorter3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); this.comboBoxSorter4Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); @@ -197,10 +197,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter4Mode.Items.Add("通过"); this.comboBoxSorter4Mode.Items.Add("运行"); this.comboBoxSorter4Mode.Items.Add("计数"); - this.comboBoxSorter4Mode.Items.Add("计数输出1"); - this.comboBoxSorter4Mode.Items.Add("计数输出2"); - this.comboBoxSorter4Mode.Items.Add("其他不良"); - this.comboBoxSorter4Mode.Items.Add("闩锁控制"); + //this.comboBoxSorter4Mode.Items.Add("计数输出1"); + //this.comboBoxSorter4Mode.Items.Add("计数输出2"); + //this.comboBoxSorter4Mode.Items.Add("其他不良"); + //this.comboBoxSorter4Mode.Items.Add("闩锁控制"); this.comboBoxSorter4Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); this.comboBoxSorter5Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); @@ -212,9 +212,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter5Mode.Items.Add("通过"); this.comboBoxSorter5Mode.Items.Add("运行"); this.comboBoxSorter5Mode.Items.Add("计数"); - this.comboBoxSorter5Mode.Items.Add("计数输出1"); - this.comboBoxSorter5Mode.Items.Add("计数输出2"); - this.comboBoxSorter5Mode.Items.Add("其他不良"); + //this.comboBoxSorter5Mode.Items.Add("计数输出1"); + //this.comboBoxSorter5Mode.Items.Add("计数输出2"); + //this.comboBoxSorter5Mode.Items.Add("其他不良"); this.comboBoxSorter5Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); this.comboBoxSorter6Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); @@ -226,9 +226,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter6Mode.Items.Add("通过"); this.comboBoxSorter6Mode.Items.Add("运行"); this.comboBoxSorter6Mode.Items.Add("计数"); - this.comboBoxSorter6Mode.Items.Add("计数输出1"); - this.comboBoxSorter6Mode.Items.Add("计数输出2"); - this.comboBoxSorter6Mode.Items.Add("其他不良"); + //this.comboBoxSorter6Mode.Items.Add("计数输出1"); + //this.comboBoxSorter6Mode.Items.Add("计数输出2"); + //this.comboBoxSorter6Mode.Items.Add("其他不良"); this.comboBoxSorter6Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); #endregion } @@ -249,10 +249,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter1Mode.Items.Add("Норма"); this.comboBoxSorter1Mode.Items.Add("Выполнение"); this.comboBoxSorter1Mode.Items.Add("Подсчет"); - this.comboBoxSorter1Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter1Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter1Mode.Items.Add("Другие неисправности"); - this.comboBoxSorter1Mode.Items.Add("контроль защелки"); + //this.comboBoxSorter1Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter1Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter1Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter1Mode.Items.Add("контроль защелки"); this.comboBoxSorter1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); @@ -264,10 +264,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter2Mode.Items.Add("Норма"); this.comboBoxSorter2Mode.Items.Add("Выполнение"); this.comboBoxSorter2Mode.Items.Add("Подсчет"); - this.comboBoxSorter2Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter2Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter2Mode.Items.Add("Другие неисправности"); - this.comboBoxSorter2Mode.Items.Add("контроль защелки"); + //this.comboBoxSorter2Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter2Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter2Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter2Mode.Items.Add("контроль защелки"); this.comboBoxSorter2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); this.comboBoxSorter3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); @@ -279,10 +279,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter3Mode.Items.Add("Норма"); this.comboBoxSorter3Mode.Items.Add("Выполнение"); this.comboBoxSorter3Mode.Items.Add("Подсчет"); - this.comboBoxSorter3Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter3Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter3Mode.Items.Add("Другие неисправности"); - this.comboBoxSorter3Mode.Items.Add("контроль защелки"); + //this.comboBoxSorter3Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter3Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter3Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter3Mode.Items.Add("контроль защелки"); this.comboBoxSorter3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); this.comboBoxSorter4Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); @@ -294,10 +294,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter4Mode.Items.Add("Норма"); this.comboBoxSorter4Mode.Items.Add("Выполнение"); this.comboBoxSorter4Mode.Items.Add("Подсчет"); - this.comboBoxSorter4Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter4Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter4Mode.Items.Add("Другие неисправности"); - this.comboBoxSorter4Mode.Items.Add("контроль защелки"); + //this.comboBoxSorter4Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter4Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter4Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter4Mode.Items.Add("контроль защелки"); this.comboBoxSorter4Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); this.comboBoxSorter5Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); @@ -309,9 +309,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter5Mode.Items.Add("Норма"); this.comboBoxSorter5Mode.Items.Add("Выполнение"); this.comboBoxSorter5Mode.Items.Add("Подсчет"); - this.comboBoxSorter5Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter5Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter5Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter5Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter5Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter5Mode.Items.Add("Другие неисправности"); this.comboBoxSorter5Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); this.comboBoxSorter6Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); @@ -323,9 +323,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter6Mode.Items.Add("Норма"); this.comboBoxSorter6Mode.Items.Add("Выполнение"); this.comboBoxSorter6Mode.Items.Add("Подсчет"); - this.comboBoxSorter6Mode.Items.Add("Счетный выход1"); - this.comboBoxSorter6Mode.Items.Add("Счетный выход2"); - this.comboBoxSorter6Mode.Items.Add("Другие неисправности"); + //this.comboBoxSorter6Mode.Items.Add("Счетный выход1"); + //this.comboBoxSorter6Mode.Items.Add("Счетный выход2"); + //this.comboBoxSorter6Mode.Items.Add("Другие неисправности"); this.comboBoxSorter6Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); #endregion } @@ -343,10 +343,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter1Mode.Items.Add("Bestehen"); this.comboBoxSorter1Mode.Items.Add("Lauf"); this.comboBoxSorter1Mode.Items.Add("Einstellen"); - this.comboBoxSorter1Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter1Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter1Mode.Items.Add("Ex.Schlecht"); - this.comboBoxSorter1Mode.Items.Add("Verriegelungssteuerung"); + //this.comboBoxSorter1Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter1Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter1Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter1Mode.Items.Add("Verriegelungssteuerung"); this.comboBoxSorter1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); @@ -358,10 +358,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter2Mode.Items.Add("Bestehen"); this.comboBoxSorter2Mode.Items.Add("Lauf"); this.comboBoxSorter2Mode.Items.Add("Einstellen"); - this.comboBoxSorter2Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter2Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter2Mode.Items.Add("Ex.Schlecht"); - this.comboBoxSorter2Mode.Items.Add("Verriegelungssteuerung"); + //this.comboBoxSorter2Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter2Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter2Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter2Mode.Items.Add("Verriegelungssteuerung"); this.comboBoxSorter2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); this.comboBoxSorter3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); @@ -373,10 +373,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter3Mode.Items.Add("Bestehen"); this.comboBoxSorter3Mode.Items.Add("Lauf"); this.comboBoxSorter3Mode.Items.Add("Einstellen"); - this.comboBoxSorter3Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter3Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter3Mode.Items.Add("Ex.Schlecht"); - this.comboBoxSorter3Mode.Items.Add("Verriegelungssteuerung"); + //this.comboBoxSorter3Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter3Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter3Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter3Mode.Items.Add("Verriegelungssteuerung"); this.comboBoxSorter3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); this.comboBoxSorter4Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); @@ -388,10 +388,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter4Mode.Items.Add("Bestehen"); this.comboBoxSorter4Mode.Items.Add("Lauf"); this.comboBoxSorter4Mode.Items.Add("Einstellen"); - this.comboBoxSorter4Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter4Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter4Mode.Items.Add("Ex.Schlecht"); - this.comboBoxSorter4Mode.Items.Add("Verriegelungssteuerung"); + //this.comboBoxSorter4Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter4Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter4Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter4Mode.Items.Add("Verriegelungssteuerung"); this.comboBoxSorter4Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); this.comboBoxSorter5Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); @@ -403,9 +403,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter5Mode.Items.Add("Bestehen"); this.comboBoxSorter5Mode.Items.Add("Lauf"); this.comboBoxSorter5Mode.Items.Add("Einstellen"); - this.comboBoxSorter5Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter5Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter5Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter5Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter5Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter5Mode.Items.Add("Ex.Schlecht"); this.comboBoxSorter5Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); this.comboBoxSorter6Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); @@ -417,9 +417,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter6Mode.Items.Add("Bestehen"); this.comboBoxSorter6Mode.Items.Add("Lauf"); this.comboBoxSorter6Mode.Items.Add("Einstellen"); - this.comboBoxSorter6Mode.Items.Add("Zählen der Ausgabe1"); - this.comboBoxSorter6Mode.Items.Add("Zählen der Ausgabe2"); - this.comboBoxSorter6Mode.Items.Add("Ex.Schlecht"); + //this.comboBoxSorter6Mode.Items.Add("Zählen der Ausgabe1"); + //this.comboBoxSorter6Mode.Items.Add("Zählen der Ausgabe2"); + //this.comboBoxSorter6Mode.Items.Add("Ex.Schlecht"); this.comboBoxSorter6Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); #endregion } @@ -437,10 +437,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter1Mode.Items.Add("정량"); this.comboBoxSorter1Mode.Items.Add("운전"); this.comboBoxSorter1Mode.Items.Add("개수"); - this.comboBoxSorter1Mode.Items.Add("카운터출력1"); - this.comboBoxSorter1Mode.Items.Add("카운터출력2"); - this.comboBoxSorter1Mode.Items.Add("ExNG"); - this.comboBoxSorter1Mode.Items.Add("시건장치 제어"); // 10 + //this.comboBoxSorter1Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter1Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter1Mode.Items.Add("ExNG"); + //this.comboBoxSorter1Mode.Items.Add("시건장치 제어"); // 10 this.comboBoxSorter1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter2Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); @@ -452,10 +452,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter2Mode.Items.Add("정량"); this.comboBoxSorter2Mode.Items.Add("운전"); this.comboBoxSorter2Mode.Items.Add("개수"); - this.comboBoxSorter2Mode.Items.Add("카운터출력1"); - this.comboBoxSorter2Mode.Items.Add("카운터출력2"); - this.comboBoxSorter2Mode.Items.Add("ExNG"); - this.comboBoxSorter2Mode.Items.Add("시건장치 제어"); // 10 + //this.comboBoxSorter2Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter2Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter2Mode.Items.Add("ExNG"); + //this.comboBoxSorter2Mode.Items.Add("시건장치 제어"); // 10 this.comboBoxSorter2Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter2Mode_SelectedIndexChanged); this.comboBoxSorter3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); @@ -467,10 +467,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter3Mode.Items.Add("정량"); this.comboBoxSorter3Mode.Items.Add("운전"); this.comboBoxSorter3Mode.Items.Add("개수"); - this.comboBoxSorter3Mode.Items.Add("카운터출력1"); - this.comboBoxSorter3Mode.Items.Add("카운터출력2"); - this.comboBoxSorter3Mode.Items.Add("ExNG"); - this.comboBoxSorter3Mode.Items.Add("시건장치 제어"); // 10 + //this.comboBoxSorter3Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter3Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter3Mode.Items.Add("ExNG"); + //this.comboBoxSorter3Mode.Items.Add("시건장치 제어"); // 10 this.comboBoxSorter3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter3Mode_SelectedIndexChanged); this.comboBoxSorter4Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); @@ -482,10 +482,10 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter4Mode.Items.Add("정량"); this.comboBoxSorter4Mode.Items.Add("운전"); this.comboBoxSorter4Mode.Items.Add("개수"); - this.comboBoxSorter4Mode.Items.Add("카운터출력1"); - this.comboBoxSorter4Mode.Items.Add("카운터출력2"); - this.comboBoxSorter4Mode.Items.Add("ExNG"); - this.comboBoxSorter4Mode.Items.Add("시건장치 제어"); // 10 + //this.comboBoxSorter4Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter4Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter4Mode.Items.Add("ExNG"); + //this.comboBoxSorter4Mode.Items.Add("시건장치 제어"); // 10 this.comboBoxSorter4Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter4Mode_SelectedIndexChanged); this.comboBoxSorter5Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); @@ -497,9 +497,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter5Mode.Items.Add("정량"); this.comboBoxSorter5Mode.Items.Add("운전"); this.comboBoxSorter5Mode.Items.Add("개수"); - this.comboBoxSorter5Mode.Items.Add("카운터출력1"); - this.comboBoxSorter5Mode.Items.Add("카운터출력2"); - this.comboBoxSorter5Mode.Items.Add("ExNG"); + //this.comboBoxSorter5Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter5Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter5Mode.Items.Add("ExNG"); this.comboBoxSorter5Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter5Mode_SelectedIndexChanged); this.comboBoxSorter6Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); @@ -511,9 +511,9 @@ namespace ITC81DB_0H.Controls this.comboBoxSorter6Mode.Items.Add("정량"); this.comboBoxSorter6Mode.Items.Add("운전"); this.comboBoxSorter6Mode.Items.Add("개수"); - this.comboBoxSorter6Mode.Items.Add("카운터출력1"); - this.comboBoxSorter6Mode.Items.Add("카운터출력2"); - this.comboBoxSorter6Mode.Items.Add("ExNG"); + //this.comboBoxSorter6Mode.Items.Add("카운터출력1"); + //this.comboBoxSorter6Mode.Items.Add("카운터출력2"); + //this.comboBoxSorter6Mode.Items.Add("ExNG"); this.comboBoxSorter6Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSorter6Mode_SelectedIndexChanged); #endregion } diff --git a/ITC81DB_0H/Forms/FormMain.cs b/ITC81DB_0H/Forms/FormMain.cs index f92376a..3fb7e1e 100644 --- a/ITC81DB_0H/Forms/FormMain.cs +++ b/ITC81DB_0H/Forms/FormMain.cs @@ -339,6 +339,7 @@ namespace ITC81DB_0H.Forms this.CurrentUser = new User(); this.CurrentUserGroup = new UserGroup(); this.CollectionBufferWeightData = new Collection(); + this.UpdateForMain = new UpdateForMainBoard(); this.CollectionProductItem = new Collection(); this.CollectionJudgmentItem = new Collection(); @@ -1800,6 +1801,9 @@ namespace ITC81DB_0H.Forms this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); #endregion break; + case "CBU": + this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFinish(); + break; //case "Cmd": // #region 업다운 - 다운 // this.ChildFormMainDisplay.ConveryorUpDownButtonUp(true); @@ -2055,6 +2059,7 @@ namespace ITC81DB_0H.Forms if (iValue <= 0 || iValue > 1000) return ret = -1; this.SystemConfig1.ProductNumber = iValue; + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ProgramVersion, ""); // 최초에 부팅이 완료 되었는지 확인 if (this.IsBootingComplete == false) @@ -2334,7 +2339,7 @@ namespace ITC81DB_0H.Forms else { this.smartTimerUpdate.Stop(); - this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFail(); + this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFail(this.SystemConfig1.Language); } #endregion break; @@ -10379,7 +10384,7 @@ namespace ITC81DB_0H.Forms if (this.UpdateForMain.RetryCount < 5) this.RetryUpdateForMain(this.UpdateForMain); else - this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFail(); + this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFail(this.SystemConfig1.Language); } private void smartTCPMultiServer_OnClientAdd(SmartTCPMultiServer.CLIENTSINFOS addClientInfo) diff --git a/ITC81DB_0H/Program.cs b/ITC81DB_0H/Program.cs index 7da3b54..8c5a491 100644 --- a/ITC81DB_0H/Program.cs +++ b/ITC81DB_0H/Program.cs @@ -1,6 +1,8 @@ using System; using System.Linq; using System.Collections.Generic; +using System.IO; +using System.Text; using System.Windows.Forms; using ITC81DB_0H.Forms; @@ -15,14 +17,38 @@ namespace ITC81DB_0H [MTAThread] static void Main() { - //try - //{ + try + { Application.Run(new FormMain()); - //} - //catch (Exception ex) - //{ - // System.IO.File.AppendText(@"SD Card\\Text.txt").Write(ex.ToString()); - //} + } + catch (Exception ex) + { + bool fileCheck = false, directoryCheck = false; + string fullFilePath = "", message = ""; + StreamWriter sw; + + DateTime time = DateTime.Now; + + fullFilePath = string.Format("SD Card\\DataBackup\\{0:yyyyMMdd_HHmmss}.txt", time); + message = ex.ToString(); + + DirectoryInfo di = new DirectoryInfo("SD Card\\DataBackup\\"); + directoryCheck = di.Exists; + // 폴더 체크 + if (directoryCheck == false) + di.Create(); + + FileInfo fileInfo = new FileInfo(fullFilePath); + fileCheck = fileInfo.Exists; + + sw = new StreamWriter(fullFilePath, true, Encoding.UTF8); + sw.WriteLine(time.ToString("yyyy-MM-dd HH:mm:ss")); + sw.Write(message); + sw.WriteLine(); + sw.Close(); + + MessageBox.Show(message); + } } } } \ No newline at end of file diff --git a/ITC81DB_0H/Version.txt b/ITC81DB_0H/Version.txt index 4c9e8f4..59134fd 100644 --- a/ITC81DB_0H/Version.txt +++ b/ITC81DB_0H/Version.txt @@ -12,6 +12,13 @@ ⺻ м 跮 */ +@ Ver 1.0.1 by CJY + - 2020.09.23 + - ITC81DB Ver 6.9.0 Modify + - κ Ʈ κ + - ܺ + - α׷ ޽ α ߰(SD Card\\DataBackup\\) + @ Ver 1.0.0 by CJY - 2020.09.22 - ITC81DB Ver 6.9.0 Modify diff --git a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe index 603d074..b1bde18 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe differ diff --git a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe index 603d074..b1bde18 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe differ