chojy
/
ITC81DB_2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 프린터 열별 출력기능 추가 - 네추럴 F&P 요청에 의함(담당자 : 전종찬) 

1. 시리얼통신 Com1/Com3 동시에 Printer 설정 안됨
   2. 메인화면 Printer 버튼은 1/2열 선택 가능
      전체 선택 시 두 열 모두 개별 출력, 한 열만 선택 시 해당 열만 개별출력
master
CJY 2020-08-05 13:39:57 +09:00
parent 7b53d37050
commit 4de36b7901
12 changed files with 939 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs
View File

@ -270,7 +270,7 @@ namespace ITC81DB_2.Controls
public void DisplayPrintButton(SystemConfigurationItem system)
{
if (system.SerialCOM1Mode >= 3 || system.SerialCOM1Mode <= 5 || system.SerialCOM3Mode >= 3 || system.SerialCOM3Mode <= 5)
if (system.SerialCOM1Mode == 3 || system.SerialCOM3Mode == 3)
this.buttonPrint.Visible = true;
else
this.buttonPrint.Visible = false;

4
ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs generated
View File

@ -303,7 +303,7 @@
this.comboBoxCOM3BaudRate.Name = "comboBoxCOM3BaudRate";
this.comboBoxCOM3BaudRate.Size = new System.Drawing.Size(172, 40);
this.comboBoxCOM3BaudRate.TabIndex = 33;
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial2BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
//
// comboBoxCOM1BaudRate
//
@ -321,7 +321,7 @@
this.comboBoxCOM3Mode.Name = "comboBoxCOM3Mode";
this.comboBoxCOM3Mode.Size = new System.Drawing.Size(215, 40);
this.comboBoxCOM3Mode.TabIndex = 31;
this.comboBoxCOM3Mode.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
//
// comboBoxCOM1Mode
//

47
ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs
View File

@ -77,31 +77,27 @@ namespace ITC81DB_2.Controls
this.comboBoxCOM1Mode.Items.Add("None");
this.comboBoxCOM1Mode.Items.Add("STD1");
this.comboBoxCOM1Mode.Items.Add("Remote");
this.comboBoxCOM1Mode.Items.Add("Printer(All)");
this.comboBoxCOM1Mode.Items.Add("Printer(1Lane)");
this.comboBoxCOM1Mode.Items.Add("Printer(2Lane)");
this.comboBoxCOM1Mode.Items.Add("Printer");
this.comboBoxCOM1Mode.SelectedIndex = 0;
this.comboBoxCOM1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1Mode_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.Items.Clear();
this.comboBoxCOM3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.Items.Add(9600);
this.comboBoxCOM3BaudRate.Items.Add(19200);
this.comboBoxCOM3BaudRate.Items.Add(38400);
this.comboBoxCOM3BaudRate.Items.Add(115200);
this.comboBoxCOM3BaudRate.SelectedIndex = 0;
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
this.comboBoxCOM3Mode.Items.Clear();
this.comboBoxCOM3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.Items.Add("None");
this.comboBoxCOM3Mode.Items.Add("STD1");
this.comboBoxCOM3Mode.Items.Add("Remote");
this.comboBoxCOM3Mode.Items.Add("Printer(All)");
this.comboBoxCOM3Mode.Items.Add("Printer(1Lane)");
this.comboBoxCOM3Mode.Items.Add("Printer(2Lane)");
this.comboBoxCOM3Mode.Items.Add("Printer");
this.comboBoxCOM3Mode.SelectedIndex = 0;
this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
this.labelCh1Format.Text = "";
this.labelCh2Format.Text = "";
@ -170,16 +166,16 @@ namespace ITC81DB_2.Controls
// CH2. BaudRate
if (this.comboBoxCOM3BaudRate.SelectedIndex != item.SerialCOM3BaudRate)
{
this.comboBoxCOM3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndex = item.SerialCOM3BaudRate;
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2BaudRate_SelectedIndexChanged);
this.comboBoxCOM3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged);
}
// CH2. Mode
if (this.comboBoxCOM3Mode.SelectedIndex != item.SerialCOM3Mode)
{
this.comboBoxCOM3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndex = item.SerialCOM3Mode;
this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial2Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
}
this.UpdateLabelFormatDisplay();
@ -210,11 +206,11 @@ namespace ITC81DB_2.Controls
this.UpdateLabelFormat1Display();
}
private void comboBoxSerial2BaudRate_SelectedIndexChanged(object sender, EventArgs e)
private void comboBoxSerial3BaudRate_SelectedIndexChanged(object sender, EventArgs e)
{
this.buttonSave2.Enabled = true;
}
private void comboBoxSerial2Mode_SelectedIndexChanged(object sender, EventArgs e)
private void comboBoxSerial3Mode_SelectedIndexChanged(object sender, EventArgs e)
{
this.buttonSave2.Enabled = true;
@ -223,6 +219,15 @@ namespace ITC81DB_2.Controls
private void buttonSave1_Click(object sender, EventArgs e)
{
if (this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode == 3 && this.comboBoxCOM1Mode.SelectedIndex == 3)
{
this.comboBoxCOM3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
this.comboBoxCOM3Mode.SelectedIndex = 0;
this.comboBoxCOM3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged);
this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode = this.comboBoxCOM3Mode.SelectedIndex;
this.ParentForm.ParentForm.CloseSerialCOM3();
}
this.ParentForm.ParentForm.SystemConfig.SerialCOM1BaudRate = this.comboBoxCOM1BaudRate.SelectedIndex;
this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = this.comboBoxCOM1Mode.SelectedIndex;
@ -237,6 +242,16 @@ namespace ITC81DB_2.Controls
}
private void buttonSave2_Click(object sender, EventArgs e)
{
if (this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode == 3 && this.comboBoxCOM3Mode.SelectedIndex == 3)
{
this.comboBoxCOM1Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial1Mode_SelectedIndexChanged);
this.comboBoxCOM1Mode.SelectedIndex = 0;
this.comboBoxCOM1Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial1Mode_SelectedIndexChanged);
this.ParentForm.ParentForm.SystemConfig.SerialCOM1Mode = this.comboBoxCOM1Mode.SelectedIndex;
this.ParentForm.ParentForm.CloseSerialCOM1();
}
this.ParentForm.ParentForm.SystemConfig.SerialCOM3BaudRate = this.comboBoxCOM3BaudRate.SelectedIndex;
this.ParentForm.ParentForm.SystemConfig.SerialCOM3Mode = this.comboBoxCOM3Mode.SelectedIndex;

17
ITC81DB_2/DataStore.cs
View File

@ -682,7 +682,8 @@ namespace ITC81DB_2
#region Field
private bool m_IsDataBackup;
private bool m_IsLogin;
private bool m_IsPrintPerProductEnable;
private bool m_IsPrint1Enable;
private bool m_IsPrint2Enable;
private int m_EquipmentID;
private int m_DecimalPlaces;
@ -726,10 +727,15 @@ namespace ITC81DB_2
get { return this.m_IsLogin; }
set { this.m_IsLogin = value; }
}
public bool IsPrintPerProductEnable
public bool IsPrint1Enable
{
get { return this.m_IsPrintPerProductEnable; }
set { this.m_IsPrintPerProductEnable = value; }
get { return this.m_IsPrint1Enable; }
set { this.m_IsPrint1Enable = value; }
}
public bool IsPrint2Enable
{
get { return this.m_IsPrint2Enable; }
set { this.m_IsPrint2Enable = value; }
}
public int EquipmentID
@ -837,7 +843,8 @@ namespace ITC81DB_2
{
this.IsDataBackup = false;
this.IsLogin = false;
this.IsPrintPerProductEnable = false;
this.IsPrint1Enable = false;
this.IsPrint2Enable = false;
this.EquipmentID = 1;
this.DecimalPlaces = 1;

24
ITC81DB_2/Forms/FormMain.cs
View File

@ -1497,11 +1497,7 @@ namespace ITC81DB_2.Forms
this.TransferSerialCOM1(this.Transfer_2_Remote(this.CurrentWeightData1, this.CurrentProductItem1));
break;
case 3:
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)
if (this.SystemConfig.IsPrint1Enable == true)
this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1));
break;
default:
@ -1520,11 +1516,7 @@ namespace ITC81DB_2.Forms
this.TransferSerialCOM3(this.Transfer_2_Remote(this.CurrentWeightData1, this.CurrentProductItem1));
break;
case 3:
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)
if (this.SystemConfig.IsPrint1Enable == true)
this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1));
break;
default:
@ -1576,11 +1568,7 @@ namespace ITC81DB_2.Forms
this.TransferSerialCOM1(this.Transfer_2_Remote(this.CurrentWeightData2, this.CurrentProductItem2));
break;
case 3:
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)
if (this.SystemConfig.IsPrint2Enable == true)
this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2));
break;
default:
@ -1599,11 +1587,7 @@ namespace ITC81DB_2.Forms
this.TransferSerialCOM3(this.Transfer_2_Remote(this.CurrentWeightData2, this.CurrentProductItem2));
break;
case 3:
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)
if(this.SystemConfig.IsPrint2Enable == true)
this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2));
break;
default:

103
ITC81DB_2/Forms/FormMainDisplay.Designer.cs generated
View File

@ -40,7 +40,7 @@
this.buttonProductNo = new SmartX.SmartButton();
this.buttonClear = new SmartX.SmartButton();
this.buttonZero = new SmartX.SmartButton();
this.buttonPrint = new SmartX.SmartButton();
this.buttonPrint1 = new SmartX.SmartButton();
this.pictureBoxStart = new System.Windows.Forms.PictureBox();
this.pictureBoxCommunicationStatus = new System.Windows.Forms.PictureBox();
this.timerPrinting = new System.Windows.Forms.Timer();
@ -64,6 +64,7 @@
this.pictureBoxCOM3Disable = new System.Windows.Forms.PictureBox();
this.pictureBoxIconUsbDesable = new System.Windows.Forms.PictureBox();
this.buttonConveyorUpDown = new SmartX.SmartButton();
this.buttonPrint2 = new SmartX.SmartButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@ -291,37 +292,37 @@
this.buttonZero.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonZero.UpImage")));
this.buttonZero.Click += new System.EventHandler(this.buttonZero_Click);
//
// buttonPrint
// buttonPrint1
//
this.buttonPrint.BackPictureBox = null;
this.buttonPrint.BackPictureBox1 = null;
this.buttonPrint.BackPictureBox2 = null;
this.buttonPrint.ButtonColor = System.Drawing.Color.Gray;
this.buttonPrint.ButtonImageAutoSize = true;
this.buttonPrint.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonPrint.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint.DisableImage")));
this.buttonPrint.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint.DownImage")));
this.buttonPrint.GroupID = 0;
this.buttonPrint.InitVisible = false;
this.buttonPrint.Location = new System.Drawing.Point(710, 305);
this.buttonPrint.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPrint.Name = "buttonPrint";
this.buttonPrint.NestedClickEventPrevent = false;
this.buttonPrint.OutlinePixel = 1;
this.buttonPrint.RepeatInterval = 200;
this.buttonPrint.RepeatIntervalAccelerate = null;
this.buttonPrint.SafeInterval = 200;
this.buttonPrint.Size = new System.Drawing.Size(90, 57);
this.buttonPrint.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonPrint.TabIndex = 447;
this.buttonPrint.TextColor = System.Drawing.Color.White;
this.buttonPrint.TextDownColor = System.Drawing.Color.White;
this.buttonPrint.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonPrint.TextLocation = new System.Drawing.Point(0, 0);
this.buttonPrint.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonPrint.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint.UpImage")));
this.buttonPrint.Visible = false;
this.buttonPrint.Click += new System.EventHandler(this.buttonPrint_Click);
this.buttonPrint1.BackPictureBox = null;
this.buttonPrint1.BackPictureBox1 = null;
this.buttonPrint1.BackPictureBox2 = null;
this.buttonPrint1.ButtonColor = System.Drawing.Color.Gray;
this.buttonPrint1.ButtonImageAutoSize = true;
this.buttonPrint1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonPrint1.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint1.DisableImage")));
this.buttonPrint1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint1.DownImage")));
this.buttonPrint1.GroupID = 0;
this.buttonPrint1.InitVisible = false;
this.buttonPrint1.Location = new System.Drawing.Point(710, 308);
this.buttonPrint1.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPrint1.Name = "buttonPrint1";
this.buttonPrint1.NestedClickEventPrevent = false;
this.buttonPrint1.OutlinePixel = 1;
this.buttonPrint1.RepeatInterval = 200;
this.buttonPrint1.RepeatIntervalAccelerate = null;
this.buttonPrint1.SafeInterval = 200;
this.buttonPrint1.Size = new System.Drawing.Size(45, 57);
this.buttonPrint1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonPrint1.TabIndex = 447;
this.buttonPrint1.TextColor = System.Drawing.Color.White;
this.buttonPrint1.TextDownColor = System.Drawing.Color.White;
this.buttonPrint1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonPrint1.TextLocation = new System.Drawing.Point(0, 0);
this.buttonPrint1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonPrint1.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint1.UpImage")));
this.buttonPrint1.Visible = false;
this.buttonPrint1.Click += new System.EventHandler(this.buttonPrint1_Click);
//
// pictureBoxStart
//
@ -718,7 +719,7 @@
this.buttonConveyorUpDown.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonConveyorUpDown.DownImage")));
this.buttonConveyorUpDown.GroupID = 0;
this.buttonConveyorUpDown.InitVisible = false;
this.buttonConveyorUpDown.Location = new System.Drawing.Point(710, 368);
this.buttonConveyorUpDown.Location = new System.Drawing.Point(710, 371);
this.buttonConveyorUpDown.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonConveyorUpDown.Name = "buttonConveyorUpDown";
this.buttonConveyorUpDown.NestedClickEventPrevent = false;
@ -738,12 +739,45 @@
this.buttonConveyorUpDown.Visible = false;
this.buttonConveyorUpDown.Click += new System.EventHandler(this.buttonConveyorUpDown_Click);
//
// buttonPrint2
//
this.buttonPrint2.BackPictureBox = null;
this.buttonPrint2.BackPictureBox1 = null;
this.buttonPrint2.BackPictureBox2 = null;
this.buttonPrint2.ButtonColor = System.Drawing.Color.Gray;
this.buttonPrint2.ButtonImageAutoSize = true;
this.buttonPrint2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonPrint2.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint2.DisableImage")));
this.buttonPrint2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint2.DownImage")));
this.buttonPrint2.GroupID = 0;
this.buttonPrint2.InitVisible = false;
this.buttonPrint2.Location = new System.Drawing.Point(755, 308);
this.buttonPrint2.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPrint2.Name = "buttonPrint2";
this.buttonPrint2.NestedClickEventPrevent = false;
this.buttonPrint2.OutlinePixel = 1;
this.buttonPrint2.RepeatInterval = 200;
this.buttonPrint2.RepeatIntervalAccelerate = null;
this.buttonPrint2.SafeInterval = 200;
this.buttonPrint2.Size = new System.Drawing.Size(45, 57);
this.buttonPrint2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonPrint2.TabIndex = 561;
this.buttonPrint2.TextColor = System.Drawing.Color.White;
this.buttonPrint2.TextDownColor = System.Drawing.Color.White;
this.buttonPrint2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonPrint2.TextLocation = new System.Drawing.Point(0, 0);
this.buttonPrint2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonPrint2.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPrint2.UpImage")));
this.buttonPrint2.Visible = false;
this.buttonPrint2.Click += new System.EventHandler(this.buttonPrint2_Click);
//
// FormMainDisplay
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(800, 600);
this.Controls.Add(this.buttonPrint2);
this.Controls.Add(this.buttonConveyorUpDown);
this.Controls.Add(this.pictureBoxIconUsbEnable);
this.Controls.Add(this.pictureBoxCOM1Enable);
@ -762,7 +796,7 @@
this.Controls.Add(this.pictureBoxStart);
this.Controls.Add(this.buttonMenu);
this.Controls.Add(this.buttonClear);
this.Controls.Add(this.buttonPrint);
this.Controls.Add(this.buttonPrint1);
this.Controls.Add(this.labelTime);
this.Controls.Add(this.labelLotNo);
this.Controls.Add(this.labelProductName);
@ -790,7 +824,7 @@
private SmartX.SmartButton buttonProductNo;
private SmartX.SmartButton buttonClear;
private SmartX.SmartButton buttonZero;
private SmartX.SmartButton buttonPrint;
private SmartX.SmartButton buttonPrint1;
private System.Windows.Forms.PictureBox pictureBoxStart;
public System.Windows.Forms.PictureBox pictureBoxCommunicationStatus;
private System.Windows.Forms.Timer timerPrinting;
@ -814,5 +848,6 @@
private System.Windows.Forms.PictureBox pictureBoxCOM3Disable;
private System.Windows.Forms.PictureBox pictureBoxIconUsbDesable;
private SmartX.SmartButton buttonConveyorUpDown;
private SmartX.SmartButton buttonPrint2;
}
}

63
ITC81DB_2/Forms/FormMainDisplay.cs
View File

@ -61,9 +61,6 @@ namespace ITC81DB_2.Forms
this.buttonZero.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayZeroDisable));
this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayZeroDown));
this.buttonZero.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayZeroUp));
this.buttonPrint.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayPrintDisable));
this.buttonPrint.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayPrintDown));
this.buttonPrint.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayPrintUp));
this.buttonWeightInputMode.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayDeviationUp));
this.buttonWeightInputMode.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayWeightUp));
this.buttonClear.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayClearDisable));
@ -81,9 +78,6 @@ namespace ITC81DB_2.Forms
this.buttonZero.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayZeroDisable));
this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayZeroDown));
this.buttonZero.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayZeroUp));
this.buttonPrint.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayPrintDisable));
this.buttonPrint.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayPrintDown));
this.buttonPrint.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayPrintUp));
this.buttonWeightInputMode.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayDeviationUp));
this.buttonWeightInputMode.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayWeightUp));
this.buttonClear.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korFormMainDisplayClearDisable));
@ -226,10 +220,16 @@ namespace ITC81DB_2.Forms
public void DisplayPrintButton(SystemConfigurationItem system)
{
if (system.SerialCOM1Mode >= 3 || system.SerialCOM1Mode <= 5 || system.SerialCOM3Mode >= 3 || system.SerialCOM3Mode <= 5)
this.buttonPrint.Visible = true;
if (system.SerialCOM1Mode == 3 || system.SerialCOM3Mode == 3)
{
this.buttonPrint1.Visible = true;
this.buttonPrint2.Visible = true;
}
else
this.buttonPrint.Visible = false;
{
this.buttonPrint1.Visible = false;
this.buttonPrint2.Visible = false;
}
}
private void UpdateDisplay()
{
@ -747,21 +747,26 @@ namespace ITC81DB_2.Forms
}
}
private void buttonPrint_Click(object sender, EventArgs e)
private void buttonPrint1_Click(object sender, EventArgs e)
{
if (this.buttonPrint.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
if (this.buttonPrint1.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.ParentForm.SystemConfig.IsPrintPerProductEnable = true;
this.ParentForm.PrintingHeadLine();
this.ParentForm.SystemConfig.IsPrint1Enable = true;
if (this.buttonPrint2.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.ParentForm.PrintingHeadLine();
}
else
{
this.ParentForm.SystemConfig.IsPrintPerProductEnable = false;
this.ParentForm.SystemConfig.IsPrint1Enable = false;
if (this.ParentForm.SystemConfig.SerialCOM1Mode != 0)
this.ParentForm.TransferSerialCOM1("\n\n\n\n");
else if (this.ParentForm.SystemConfig.SerialCOM3Mode != 0)
this.ParentForm.TransferSerialCOM3("\n\n\n\n");
if (this.buttonPrint2.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
{
if (this.ParentForm.SystemConfig.SerialCOM1Mode == 3)
this.ParentForm.TransferSerialCOM1("\n\n\n\n");
else if (this.ParentForm.SystemConfig.SerialCOM3Mode == 3)
this.ParentForm.TransferSerialCOM3("\n\n\n\n");
}
}
//this.buttonPrint.Enabled = false;
@ -771,6 +776,28 @@ namespace ITC81DB_2.Forms
//this.ParentForm.PrintingWeight(this.ParentForm.CurrentWeightData, this.ParentForm.CurrentProductItem);
}
private void buttonPrint2_Click(object sender, EventArgs e)
{
if (this.buttonPrint2.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
{
this.ParentForm.SystemConfig.IsPrint2Enable = true;
if (this.buttonPrint1.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.ParentForm.PrintingHeadLine();
}
else
{
this.ParentForm.SystemConfig.IsPrint2Enable = false;
if (this.buttonPrint1.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
{
if (this.ParentForm.SystemConfig.SerialCOM1Mode == 3)
this.ParentForm.TransferSerialCOM1("\n\n\n\n");
else if (this.ParentForm.SystemConfig.SerialCOM3Mode == 3)
this.ParentForm.TransferSerialCOM3("\n\n\n\n");
}
}
}
private void buttonClear_Click(object sender, EventArgs e)
{
DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 8);

1388
ITC81DB_2/Forms/FormMainDisplay.resx
View File

File diff suppressed because it is too large Load Diff

6
ITC81DB_2/Version.txt
View File

@ -16,8 +16,10 @@
@ Ver 2.1.0 by CJY
- 2020.08.04
- Ver 2.0.1 Modify
- 시리얼 통신 Mode - 'Printer(1Lane)', 'Printer(2Lane)' 추가
네추럴 F&P 요청에 의함(담당자 : 전종찬)
- 프린터 열별 출력기능 추가 - 네추럴 F&P 요청에 의함(담당자 : 전종찬)
1. 시리얼통신 Com1/Com3 동시에 Printer 설정 안됨
2. 메인화면 Printer 버튼은 1/2열 선택 가능
전체 선택 시 두 열 모두 개별 출력, 한 열만 선택 시 해당 열만 개별출력
@ Ver 2.0.1 by CJY
- 2020.07.24

BIN
ITC81DB_2/bin/Release/ITC81DB_2.exe
View File

Binary file not shown.

BIN
ITC81DB_2/obj/Release/ITC81DB_2.exe
View File

Binary file not shown.

BIN
ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll
View File

Binary file not shown.