diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs index eb33223..8771d7f 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs @@ -80,6 +80,8 @@ namespace ITC81DB_2.Controls this.SelectedWeightData2 = new WeightData(); this.SelectedProductItem1 = new ProductItem(); this.SelectedProductItem2 = new ProductItem(); + + this.DisplayPrintButton(this.ParentForm.ParentForm.SystemConfig); } private void UpdateDisplay1(WeightData data, ProductItem item) @@ -266,17 +268,19 @@ namespace ITC81DB_2.Controls this.labelTotalCount2.Text = value; } + public void DisplayPrintButton(SystemConfigurationItem system) + { + if (system.SerialCOM1Mode >= 3 || system.SerialCOM1Mode <= 5 || system.SerialCOM3Mode >= 3 || system.SerialCOM3Mode <= 5) + this.buttonPrint.Visible = true; + else + this.buttonPrint.Visible = false; + } public void DisplayRefresh(SystemStatus status) { this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicDataStatistics; this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); - if (this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode == 3 || this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode == 3) - this.buttonPrint.Visible = true; - else - this.buttonPrint.Visible = false; - this.SelectedProductNo = this.ParentForm.ParentForm.SystemConfig.ProductNumber; if (this.buttonItemNo.Text != this.SelectedProductNo.ToString()) diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs index 7976ae4..650c6fb 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs @@ -77,7 +77,9 @@ namespace ITC81DB_2.Controls this.comboBoxCOM1Mode.Items.Add("None"); this.comboBoxCOM1Mode.Items.Add("STD1"); this.comboBoxCOM1Mode.Items.Add("Remote"); - this.comboBoxCOM1Mode.Items.Add("Printer"); + this.comboBoxCOM1Mode.Items.Add("Printer(All)"); + this.comboBoxCOM1Mode.Items.Add("Printer(1Lane)"); + this.comboBoxCOM1Mode.Items.Add("Printer(2Lane)"); this.comboBoxCOM1Mode.SelectedIndex = 0; this.comboBoxCOM1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1Mode_SelectedIndexChanged); @@ -95,7 +97,9 @@ namespace ITC81DB_2.Controls this.comboBoxCOM3Mode.Items.Add("None"); this.comboBoxCOM3Mode.Items.Add("STD1"); this.comboBoxCOM3Mode.Items.Add("Remote"); - this.comboBoxCOM3Mode.Items.Add("Printer"); + this.comboBoxCOM3Mode.Items.Add("Printer(All)"); + this.comboBoxCOM3Mode.Items.Add("Printer(1Lane)"); + this.comboBoxCOM3Mode.Items.Add("Printer(2Lane)"); this.comboBoxCOM3Mode.SelectedIndex = 0; this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged); @@ -118,7 +122,9 @@ namespace ITC81DB_2.Controls case 2: // Remote this.labelCh1Format.Text = "STX[1],No[2],Grd[1],Weight[6],ETX[1]"; break; - case 3: // Printer + case 3: // Printer(All) + case 4: // Printer(1Lane) + case 5: // Printer(2Lane) this.labelCh1Format.Text = "No[4],Grd[8],Weight[10],CNT[10]"; break; default: @@ -135,7 +141,9 @@ namespace ITC81DB_2.Controls case 2: // Remote this.labelCh2Format.Text = "STX[1],No[2],Grd[1],Weight[6],ETX[1]"; break; - case 3: // Printer + case 3: // Printer(All) + case 4: // Printer(1Lane) + case 5: // Printer(2Lane) this.labelCh2Format.Text = "No[4],Grd[8],Weight[10],CNT[10]"; break; default: @@ -218,6 +226,9 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.SystemConfig.SerialCOM1BaudRate = this.comboBoxCOM1BaudRate.SelectedIndex; this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = this.comboBoxCOM1Mode.SelectedIndex; + this.ParentForm.CenterBasicDataStatistics.DisplayPrintButton(this.ParentForm.ParentForm.SystemConfig); + this.ParentForm.ParentForm.ChildFormMainDisplay.DisplayPrintButton(this.ParentForm.ParentForm.SystemConfig); + this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); this.ParentForm.ParentForm.OpenSerialCOM1(); @@ -229,6 +240,9 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.SystemConfig.SerialCOM3BaudRate = this.comboBoxCOM3BaudRate.SelectedIndex; this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode = this.comboBoxCOM3Mode.SelectedIndex; + this.ParentForm.CenterBasicDataStatistics.DisplayPrintButton(this.ParentForm.ParentForm.SystemConfig); + this.ParentForm.ParentForm.ChildFormMainDisplay.DisplayPrintButton(this.ParentForm.ParentForm.SystemConfig); + this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); this.ParentForm.ParentForm.OpenSerialCOM3(); @@ -269,6 +283,8 @@ namespace ITC81DB_2.Controls #endregion break; case 3: + case 4: + case 5: #region Printer sb.Append(string.Format("{0, 4}", this.ParentForm.ParentForm.SystemConfig.ProductNumber)); sb.Append(string.Format("{0, 3}", 1)); @@ -320,6 +336,8 @@ namespace ITC81DB_2.Controls #endregion break; case 3: + case 4: + case 5: #region Printer sb.Append(string.Format("{0, 4}", this.ParentForm.ParentForm.SystemConfig.ProductNumber)); sb.Append(string.Format("{0, 3}", 1)); diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index d36aeb4..1bcec63 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber; - this.labelDisplayVer.Text = "2.0.0"; + this.labelDisplayVer.Text = "2.1.0"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs index f4fb07f..9a2fafb 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs @@ -143,7 +143,10 @@ namespace ITC81DB_2.Controls else { #region Korean - //this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korBackgroundSorterSetting)); + this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korBackgroundSorterSetting)); + + this.radioButtonDoubleEntryDsable.Text = "사용안함"; + this.radioButtonDoubleEntryEnable.Text = "사용함"; this.comboBoxSorter1Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSorter1Mode_SelectedIndexChanged); this.comboBoxSorter1Mode.Items.Clear(); diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index 8ece7c5..c5f9041 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -429,7 +429,7 @@ namespace ITC81DB_2.Forms { string value = ""; - if (this.SystemConfig.SerialCOM1Mode == 3) + if (this.SystemConfig.SerialCOM1Mode >= 3 || this.SystemConfig.SerialCOM1Mode <= 5) { this.TransferSerialCOM1("##############################"); this.TransferSerialCOM1(" TOTAL PRINT LINE1 "); @@ -512,7 +512,7 @@ namespace ITC81DB_2.Forms this.TransferSerialCOM1("##############################\n\n\n\n"); } - if (this.SystemConfig.SerialCOM3Mode == 3) + if (this.SystemConfig.SerialCOM3Mode >= 3 || this.SystemConfig.SerialCOM3Mode <= 5) { this.TransferSerialCOM3("##############################"); this.TransferSerialCOM3(" TOTAL PRINT LINE1 "); @@ -1485,7 +1485,7 @@ namespace ITC81DB_2.Forms // 통신 제대로 받으면 ACK this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); - // 통신 CH1 + // 통신 COM1 if (this.SystemConfig.SerialCOM1Mode != 0) { switch (this.SystemConfig.SerialCOM1Mode) @@ -1500,14 +1500,18 @@ namespace ITC81DB_2.Forms if (this.SystemConfig.IsPrintPerProductEnable == true) this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); break; + case 4: + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); + break; default: break; } } - // 통신 CH2 - if (this.SystemConfig.SerialCOM1Mode != 0) + // 통신 COM3 + if (this.SystemConfig.SerialCOM3Mode != 0) { - switch (this.SystemConfig.SerialCOM1Mode) + switch (this.SystemConfig.SerialCOM3Mode) { case 1: this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig, DataStore.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); @@ -1519,6 +1523,10 @@ namespace ITC81DB_2.Forms if (this.SystemConfig.IsPrintPerProductEnable == true) this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); break; + case 4: + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); + break; default: break; } @@ -1556,7 +1564,7 @@ namespace ITC81DB_2.Forms // 통신 제대로 받으면 ACK this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); - // 통신 CH1 + // 통신 COM1 if (this.SystemConfig.SerialCOM1Mode != 0) { switch (this.SystemConfig.SerialCOM1Mode) @@ -1571,14 +1579,18 @@ namespace ITC81DB_2.Forms if (this.SystemConfig.IsPrintPerProductEnable == true) this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); break; + case 5: + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); + break; default: break; } } - // 통신 CH2 - if (this.SystemConfig.SerialCOM1Mode != 0) + // 통신 COM3 + if (this.SystemConfig.SerialCOM3Mode != 0) { - switch (this.SystemConfig.SerialCOM1Mode) + switch (this.SystemConfig.SerialCOM3Mode) { case 1: this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig, DataStore.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); @@ -1590,6 +1602,10 @@ namespace ITC81DB_2.Forms if(this.SystemConfig.IsPrintPerProductEnable == true) this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); break; + case 5: + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); + break; default: break; } diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 8562534..7ee8018 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -144,6 +144,7 @@ namespace ITC81DB_2.Forms this.InitializeControl(); this.UpdateDisplay(); + this.DisplayPrintButton(this.ParentForm.SystemConfig); // 알람 표시 this.pictureBoxIconAlarm.Visible = false; @@ -223,6 +224,13 @@ namespace ITC81DB_2.Forms this.MainDisplayXYChart.Clear(); } + public void DisplayPrintButton(SystemConfigurationItem system) + { + if (system.SerialCOM1Mode >= 3 || system.SerialCOM1Mode <= 5 || system.SerialCOM3Mode >= 3 || system.SerialCOM3Mode <= 5) + this.buttonPrint.Visible = true; + else + this.buttonPrint.Visible = false; + } private void UpdateDisplay() { // Icon - 데이터 백업 @@ -260,11 +268,6 @@ namespace ITC81DB_2.Forms this.pictureBoxCOM3Enable.Visible = true; this.pictureBoxCOM3Disable.Visible = false; } - - if (this.ParentForm.SystemConfig.SerialCOM3Mode == 3 || this.ParentForm.SystemConfig.SerialCOM1Mode == 3) - this.buttonPrint.Visible = true; - else - this.buttonPrint.Visible = false; } private void UpdateDisplayUser(SystemStatus status) { @@ -755,9 +758,9 @@ namespace ITC81DB_2.Forms { this.ParentForm.SystemConfig.IsPrintPerProductEnable = false; - if (this.ParentForm.SystemConfig.SerialCOM1Mode == 3) + if (this.ParentForm.SystemConfig.SerialCOM1Mode != 0) this.ParentForm.TransferSerialCOM1("\n\n\n\n"); - else if (this.ParentForm.SystemConfig.SerialCOM3Mode == 3) + else if (this.ParentForm.SystemConfig.SerialCOM3Mode != 0) this.ParentForm.TransferSerialCOM3("\n\n\n\n"); } diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 15c2308..48880d2 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,11 +13,19 @@ 2 ⺻ 跮 */ +@ Ver 2.1.0 by CJY + - 2020.08.04 + - Ver 2.0.1 Modify + - ø Mode - 'Printer(1Lane)', 'Printer(2Lane)' ߰ + ߷ F&P û ( : ) + @ Ver 2.0.1 by CJY - 2020.07.24 - Ver 2.0.0 Modify - - - Ͼ ư ȭ ȯ ȵǴ - - ǥ ȵǴ + - + 1. Ͼ ư ȭ ȯ ȵǴ + 2. ⼳ ->ѱ۷ ȭ ѱ۷ ȵǴ + - Ͼ ǥ ȵǴ @ Ver 2.0.0 by CJY - 2020.07.15 diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index 6ef1928..c91c44d 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2.exe and b/ITC81DB_2/bin/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index 6ef1928..c91c44d 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll index dd9e613..1afac19 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll differ