Compare commits

...

2 Commits

Author SHA1 Message Date
sj84 33c01ae072 Merge branch 'master' into SJ_Branch
# Conflicts:
#	INT69DC_7C/Forms/FormInformation.cs
#	INT69DC_7C/Version.txt
2025-03-18 13:22:00 +09:00
sj84 e71a8fc3c1 @ Ver 12.2.3 by LSJ
- 2025.03.13
 - Ver 12.2.2 Modify
 - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
 - 영테크팩 요청사항 추가
   OP6 프로토콜 수정
   중량 설정값 추가
   OPT6 : STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]
   --> STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]
2025-03-18 13:16:09 +09:00
5 changed files with 164 additions and 229 deletions

View File

@ -37,7 +37,6 @@
this.labelTitleSlaveID = new SmartX.SmartLabel(); this.labelTitleSlaveID = new SmartX.SmartLabel();
this.buttonSerialSend = new System.Windows.Forms.Button(); this.buttonSerialSend = new System.Windows.Forms.Button();
this.buttonSerialSave = new System.Windows.Forms.Button(); this.buttonSerialSave = new System.Windows.Forms.Button();
this.labelProtocolDescriptionCOM3_2 = new SmartX.SmartLabel();
this.labelProtocolDescriptionCOM3_1 = new SmartX.SmartLabel(); this.labelProtocolDescriptionCOM3_1 = new SmartX.SmartLabel();
this.labelABFoodTimeoutInterval = new SmartX.SmartLabel(); this.labelABFoodTimeoutInterval = new SmartX.SmartLabel();
this.labelTitleTimeout = new SmartX.SmartLabel(); this.labelTitleTimeout = new SmartX.SmartLabel();
@ -66,7 +65,6 @@
this.labelTitleServerPort = new SmartX.SmartLabel(); this.labelTitleServerPort = new SmartX.SmartLabel();
this.labelServerStatus = new SmartX.SmartLabel(); this.labelServerStatus = new SmartX.SmartLabel();
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.labelProtocolDescriptionEthernet_2 = new SmartX.SmartLabel();
this.labelProtocolDescriptionEthernet_1 = new SmartX.SmartLabel(); this.labelProtocolDescriptionEthernet_1 = new SmartX.SmartLabel();
this.labelStartAddress = new SmartX.SmartLabel(); this.labelStartAddress = new SmartX.SmartLabel();
this.labelTitleStartAddress = new SmartX.SmartLabel(); this.labelTitleStartAddress = new SmartX.SmartLabel();
@ -184,7 +182,6 @@
this.groupBoxComm.Controls.Add(this.labelTitleSlaveID); this.groupBoxComm.Controls.Add(this.labelTitleSlaveID);
this.groupBoxComm.Controls.Add(this.buttonSerialSend); this.groupBoxComm.Controls.Add(this.buttonSerialSend);
this.groupBoxComm.Controls.Add(this.buttonSerialSave); this.groupBoxComm.Controls.Add(this.buttonSerialSave);
this.groupBoxComm.Controls.Add(this.labelProtocolDescriptionCOM3_2);
this.groupBoxComm.Controls.Add(this.labelProtocolDescriptionCOM3_1); this.groupBoxComm.Controls.Add(this.labelProtocolDescriptionCOM3_1);
this.groupBoxComm.Controls.Add(this.labelABFoodTimeoutInterval); this.groupBoxComm.Controls.Add(this.labelABFoodTimeoutInterval);
this.groupBoxComm.Controls.Add(this.labelTitleTimeout); this.groupBoxComm.Controls.Add(this.labelTitleTimeout);
@ -271,25 +268,6 @@
this.buttonSerialSave.Text = "SAVE"; this.buttonSerialSave.Text = "SAVE";
this.buttonSerialSave.Click += new System.EventHandler(this.buttonSerialSave_Click); this.buttonSerialSave.Click += new System.EventHandler(this.buttonSerialSave_Click);
// //
// labelProtocolDescriptionCOM3_2
//
this.labelProtocolDescriptionCOM3_2.BackPictureBox = this.smartForm1;
this.labelProtocolDescriptionCOM3_2.BackPictureBox1 = null;
this.labelProtocolDescriptionCOM3_2.BackPictureBox2 = null;
this.labelProtocolDescriptionCOM3_2.BorderColor = System.Drawing.Color.Black;
this.labelProtocolDescriptionCOM3_2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelProtocolDescriptionCOM3_2.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelProtocolDescriptionCOM3_2.InitVisible = true;
this.labelProtocolDescriptionCOM3_2.LineSpacing = 0F;
this.labelProtocolDescriptionCOM3_2.Location = new System.Drawing.Point(47, 110);
this.labelProtocolDescriptionCOM3_2.Name = "labelProtocolDescriptionCOM3_2";
this.labelProtocolDescriptionCOM3_2.Size = new System.Drawing.Size(320, 20);
this.labelProtocolDescriptionCOM3_2.TabIndex = 25;
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionCOM3_2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.labelProtocolDescriptionCOM3_2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelProtocolDescriptionCOM3_2.Wordwrap = false;
//
// labelProtocolDescriptionCOM3_1 // labelProtocolDescriptionCOM3_1
// //
this.labelProtocolDescriptionCOM3_1.BackPictureBox = this.smartForm1; this.labelProtocolDescriptionCOM3_1.BackPictureBox = this.smartForm1;
@ -302,12 +280,12 @@
this.labelProtocolDescriptionCOM3_1.LineSpacing = 0F; this.labelProtocolDescriptionCOM3_1.LineSpacing = 0F;
this.labelProtocolDescriptionCOM3_1.Location = new System.Drawing.Point(47, 84); this.labelProtocolDescriptionCOM3_1.Location = new System.Drawing.Point(47, 84);
this.labelProtocolDescriptionCOM3_1.Name = "labelProtocolDescriptionCOM3_1"; this.labelProtocolDescriptionCOM3_1.Name = "labelProtocolDescriptionCOM3_1";
this.labelProtocolDescriptionCOM3_1.Size = new System.Drawing.Size(320, 20); this.labelProtocolDescriptionCOM3_1.Size = new System.Drawing.Size(320, 46);
this.labelProtocolDescriptionCOM3_1.TabIndex = 23; this.labelProtocolDescriptionCOM3_1.TabIndex = 23;
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description"; this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionCOM3_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelProtocolDescriptionCOM3_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.labelProtocolDescriptionCOM3_1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelProtocolDescriptionCOM3_1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
this.labelProtocolDescriptionCOM3_1.Wordwrap = false; this.labelProtocolDescriptionCOM3_1.Wordwrap = true;
// //
// labelABFoodTimeoutInterval // labelABFoodTimeoutInterval
// //
@ -798,7 +776,6 @@
// //
this.smartGroupBox1.BackPictureBox = this.smartForm1; this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.labelProtocolDescriptionEthernet_2);
this.smartGroupBox1.Controls.Add(this.labelProtocolDescriptionEthernet_1); this.smartGroupBox1.Controls.Add(this.labelProtocolDescriptionEthernet_1);
this.smartGroupBox1.Controls.Add(this.labelStartAddress); this.smartGroupBox1.Controls.Add(this.labelStartAddress);
this.smartGroupBox1.Controls.Add(this.labelTitleStartAddress); this.smartGroupBox1.Controls.Add(this.labelTitleStartAddress);
@ -840,25 +817,6 @@
this.smartGroupBox1.Text = "TCP_Local"; this.smartGroupBox1.Text = "TCP_Local";
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
// labelProtocolDescriptionEthernet_2
//
this.labelProtocolDescriptionEthernet_2.BackPictureBox = this.smartForm1;
this.labelProtocolDescriptionEthernet_2.BackPictureBox1 = null;
this.labelProtocolDescriptionEthernet_2.BackPictureBox2 = null;
this.labelProtocolDescriptionEthernet_2.BorderColor = System.Drawing.Color.Black;
this.labelProtocolDescriptionEthernet_2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelProtocolDescriptionEthernet_2.Font = new System.Drawing.Font("New Gulim", 9F, System.Drawing.FontStyle.Regular);
this.labelProtocolDescriptionEthernet_2.InitVisible = true;
this.labelProtocolDescriptionEthernet_2.LineSpacing = 0F;
this.labelProtocolDescriptionEthernet_2.Location = new System.Drawing.Point(71, 133);
this.labelProtocolDescriptionEthernet_2.Name = "labelProtocolDescriptionEthernet_2";
this.labelProtocolDescriptionEthernet_2.Size = new System.Drawing.Size(320, 20);
this.labelProtocolDescriptionEthernet_2.TabIndex = 231;
this.labelProtocolDescriptionEthernet_2.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionEthernet_2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.labelProtocolDescriptionEthernet_2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelProtocolDescriptionEthernet_2.Wordwrap = false;
//
// labelProtocolDescriptionEthernet_1 // labelProtocolDescriptionEthernet_1
// //
this.labelProtocolDescriptionEthernet_1.BackPictureBox = this.smartForm1; this.labelProtocolDescriptionEthernet_1.BackPictureBox = this.smartForm1;
@ -871,12 +829,12 @@
this.labelProtocolDescriptionEthernet_1.LineSpacing = 0F; this.labelProtocolDescriptionEthernet_1.LineSpacing = 0F;
this.labelProtocolDescriptionEthernet_1.Location = new System.Drawing.Point(71, 107); this.labelProtocolDescriptionEthernet_1.Location = new System.Drawing.Point(71, 107);
this.labelProtocolDescriptionEthernet_1.Name = "labelProtocolDescriptionEthernet_1"; this.labelProtocolDescriptionEthernet_1.Name = "labelProtocolDescriptionEthernet_1";
this.labelProtocolDescriptionEthernet_1.Size = new System.Drawing.Size(320, 20); this.labelProtocolDescriptionEthernet_1.Size = new System.Drawing.Size(320, 46);
this.labelProtocolDescriptionEthernet_1.TabIndex = 230; this.labelProtocolDescriptionEthernet_1.TabIndex = 230;
this.labelProtocolDescriptionEthernet_1.Text = "COM3 Protocol Description"; this.labelProtocolDescriptionEthernet_1.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionEthernet_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelProtocolDescriptionEthernet_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.labelProtocolDescriptionEthernet_1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelProtocolDescriptionEthernet_1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
this.labelProtocolDescriptionEthernet_1.Wordwrap = false; this.labelProtocolDescriptionEthernet_1.Wordwrap = true;
// //
// labelStartAddress // labelStartAddress
// //
@ -1566,7 +1524,6 @@
private SmartX.SmartButton buttonBack; private SmartX.SmartButton buttonBack;
private SmartX.SmartLabel labelTitle; private SmartX.SmartLabel labelTitle;
private SmartX.SmartGroupBox groupBoxComm; private SmartX.SmartGroupBox groupBoxComm;
private SmartX.SmartLabel labelProtocolDescriptionCOM3_2;
private SmartX.SmartLabel labelProtocolDescriptionCOM3_1; private SmartX.SmartLabel labelProtocolDescriptionCOM3_1;
private SmartX.SmartLabel labelABFoodTimeoutInterval; private SmartX.SmartLabel labelABFoodTimeoutInterval;
private SmartX.SmartLabel labelTitleTimeout; private SmartX.SmartLabel labelTitleTimeout;
@ -1631,7 +1588,6 @@
private SmartX.SmartLabel labelTitleStartAddress; private SmartX.SmartLabel labelTitleStartAddress;
private SmartX.SmartLabel labelSlaveID; private SmartX.SmartLabel labelSlaveID;
private SmartX.SmartLabel labelTitleSlaveID; private SmartX.SmartLabel labelTitleSlaveID;
private SmartX.SmartLabel labelProtocolDescriptionEthernet_2;
private SmartX.SmartLabel labelProtocolDescriptionEthernet_1; private SmartX.SmartLabel labelProtocolDescriptionEthernet_1;
private System.Windows.Forms.Button button10LaneSend; private System.Windows.Forms.Button button10LaneSend;
private System.Windows.Forms.Button button1LaneSend; private System.Windows.Forms.Button button1LaneSend;

View File

@ -332,8 +332,8 @@ namespace INT69DC_7C.Forms
data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem);
else if (this.ParentForm.SystemConfig.EthernetMode == 4) else if (this.ParentForm.SystemConfig.EthernetMode == 4)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem);
else if(this.ParentForm.SystemConfig.EthernetMode == 5) else if (this.ParentForm.SystemConfig.EthernetMode == 5)
data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData); data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem);
switch (this.ParentForm.SystemConfig.EthernetOperationMode) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -364,7 +364,7 @@ namespace INT69DC_7C.Forms
else if (this.ParentForm.SystemConfig.EthernetMode == 4) else if (this.ParentForm.SystemConfig.EthernetMode == 4)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem);
else if (this.ParentForm.SystemConfig.EthernetMode == 5) else if (this.ParentForm.SystemConfig.EthernetMode == 5)
data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane); data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem);
switch (this.ParentForm.SystemConfig.EthernetOperationMode) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -521,28 +521,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -553,28 +541,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -585,28 +561,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -618,26 +582,26 @@ namespace INT69DC_7C.Forms
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ {
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionEthernet_1.Text =
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
} }
else else
{ {
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionEthernet_1.Text =
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
} }
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ {
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionEthernet_1.Text =
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
} }
else else
{ {
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionEthernet_1.Text =
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
} }
} }
#endregion #endregion
@ -645,7 +609,6 @@ namespace INT69DC_7C.Forms
else else
{ {
this.labelProtocolDescriptionEthernet_1.Text = ""; this.labelProtocolDescriptionEthernet_1.Text = "";
this.labelProtocolDescriptionEthernet_2.Text = "";
} }
} }
private void UpdateProtocolDescriptionCom3Display() private void UpdateProtocolDescriptionCom3Display()
@ -654,7 +617,6 @@ namespace INT69DC_7C.Forms
{ {
#region OPT1 #region OPT1
this.labelProtocolDescriptionCOM3_1.Text = "Private use"; this.labelProtocolDescriptionCOM3_1.Text = "Private use";
this.labelProtocolDescriptionCOM3_2.Text = "";
#endregion #endregion
} }
else if (this.comboBoxSerial3Mode.SelectedIndex == 2) else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
@ -664,28 +626,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -696,28 +646,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -728,36 +666,23 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{SIGN[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],SIGN[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],SIGN[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{SIGN[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
else if (this.comboBoxSerial3Mode.SelectedIndex == 5) else if (this.comboBoxSerial3Mode.SelectedIndex == 5)
{ {
#region Printer #region Printer
this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],"; this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],COUNT[9]";
this.labelProtocolDescriptionCOM3_2.Text = "COUNT[9]";
#endregion #endregion
} }
else if (this.comboBoxSerial3Mode.SelectedIndex == 6) else if (this.comboBoxSerial3Mode.SelectedIndex == 6)
@ -767,28 +692,16 @@ namespace INT69DC_7C.Forms
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
else else
{ this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
} }
#endregion #endregion
} }
@ -800,26 +713,26 @@ namespace INT69DC_7C.Forms
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{ {
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionCOM3_1.Text =
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
} }
else else
{ {
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionCOM3_1.Text =
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
} }
} }
else else
{ {
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{ {
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionCOM3_1.Text =
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
} }
else else
{ {
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; this.labelProtocolDescriptionCOM3_1.Text =
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
} }
} }
#endregion #endregion
@ -828,7 +741,6 @@ namespace INT69DC_7C.Forms
{ {
#region None #region None
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description"; this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
#endregion #endregion
} }
} }

View File

@ -1982,9 +1982,9 @@ namespace INT69DC_7C.Forms
{ {
#region 개별 전송 #region 개별 전송
if (this.SystemConfig.IsWeightViewForward == true) if (this.SystemConfig.IsWeightViewForward == true)
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[0], 1); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[0], 1, this.CurrentProductItem);
else else
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[this.CollectionWeightData.Count - 1], this.CollectionWeightData.Count); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[this.CollectionWeightData.Count - 1], this.CollectionWeightData.Count, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
@ -2288,7 +2288,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[1], 2); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[1], 2, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -2589,7 +2589,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[2], 3); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[2], 3, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -2890,7 +2890,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[3], 4); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[3], 4, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -3191,7 +3191,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[4], 5); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[4], 5, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -3492,7 +3492,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[5], 6); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[5], 6, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -3793,7 +3793,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[6], 7); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[6], 7, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -4092,7 +4092,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[7], 8); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[7], 8, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -4388,7 +4388,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[8], 9); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[8], 9, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -4683,7 +4683,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[9], 10); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[9], 10, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -4976,7 +4976,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[10], 11); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[10], 11, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -5268,7 +5268,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[11], 12); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[11], 12, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -5618,7 +5618,7 @@ namespace INT69DC_7C.Forms
else if (this.SystemConfig.EthernetMode == 5) else if (this.SystemConfig.EthernetMode == 5)
{ {
#region OPT6 #region OPT6
etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData); etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem);
this.SendEthernetData(etherStringData); this.SendEthernetData(etherStringData);
#endregion #endregion
} }
@ -8725,9 +8725,8 @@ namespace INT69DC_7C.Forms
return sb.ToString(); return sb.ToString();
} }
private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, Collection<WeightData> datas) private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, Collection<WeightData> datas, ProductItem pItem)
{ {
string value = "";
int toTalAll = 0, toTalPass = 0, totalNg = 0; int toTalAll = 0, toTalPass = 0, totalNg = 0;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -8741,12 +8740,14 @@ namespace INT69DC_7C.Forms
sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
sb.Append(string.Format("{0:D4}", system.ProductNumber)); sb.Append(string.Format("{0:D4}", system.ProductNumber));
value = toTalPass.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.PassRange, system.DecimalPlaces)));
value = totalNg.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.OverRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.TareRange, system.DecimalPlaces)));
value = toTalAll.ToString();
sb.Append(value.PadLeft(9, ' ')); sb.Append(Helper.StringBlankFillDigits7(toTalPass.ToString()));
sb.Append(Helper.StringBlankFillDigits7(totalNg.ToString()));
sb.Append(Helper.StringBlankFillDigits9(toTalAll.ToString()));
for (int i = 0; i < system.EquipmentColumns; i++) for (int i = 0; i < system.EquipmentColumns; i++)
{ {
@ -8766,7 +8767,7 @@ namespace INT69DC_7C.Forms
return sb.ToString(); return sb.ToString();
} }
private string Protocol_OPT6_NotStxEtx_1(SystemConfigurationItem system, Collection<WeightData> datas) private string Protocol_OPT6_NotStxEtx_1(SystemConfigurationItem system, Collection<WeightData> datas, ProductItem pItem)
{ {
string value = ""; string value = "";
int toTalAll = 0, toTalPass = 0, totalNg = 0; int toTalAll = 0, toTalPass = 0, totalNg = 0;
@ -8782,12 +8783,14 @@ namespace INT69DC_7C.Forms
sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
sb.Append(string.Format("{0:D4}", system.ProductNumber)); sb.Append(string.Format("{0:D4}", system.ProductNumber));
value = toTalPass.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.PassRange, system.DecimalPlaces)));
value = totalNg.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.OverRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.TareRange, system.DecimalPlaces)));
value = toTalAll.ToString();
sb.Append(value.PadLeft(9, ' ')); sb.Append(Helper.StringBlankFillDigits7(toTalPass.ToString()));
sb.Append(Helper.StringBlankFillDigits7(totalNg.ToString()));
sb.Append(Helper.StringBlankFillDigits9(toTalAll.ToString()));
for (int i = 0; i < system.EquipmentColumns; i++) for (int i = 0; i < system.EquipmentColumns; i++)
{ {
@ -8828,17 +8831,17 @@ namespace INT69DC_7C.Forms
return sb.ToString(); return sb.ToString();
} }
public string Protocol_OPT6(SystemConfigurationItem system, Collection<WeightData> datas) public string Protocol_OPT6(SystemConfigurationItem system, Collection<WeightData> datas, ProductItem pItem)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append((char)0x02); sb.Append((char)0x02);
sb.Append(this.Protocol_OPT6_NotStxEtx(system, datas)); sb.Append(this.Protocol_OPT6_NotStxEtx(system, datas, pItem));
sb.Append((char)0x03); sb.Append((char)0x03);
return sb.ToString(); return sb.ToString();
} }
private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, WeightData data, int lane) private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, WeightData data, int lane, ProductItem pItem)
{ {
string value = ""; string value = "";
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -8846,12 +8849,14 @@ namespace INT69DC_7C.Forms
sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); sb.Append(string.Format("IN{0:D3}", system.EquipmentID));
sb.Append(string.Format("{0:D4}", system.ProductNumber)); sb.Append(string.Format("{0:D4}", system.ProductNumber));
value = data.PassCount.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.UnderRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.PassRange, system.DecimalPlaces)));
value = data.TotalNGCount.ToString(); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.OverRange, system.DecimalPlaces)));
sb.Append(value.PadLeft(7, ' ')); sb.Append(Helper.StringBlankFillDigits6(Helper.StringToDecimalPlaces(pItem.TareRange, system.DecimalPlaces)));
value = data.TotalCount.ToString();
sb.Append(value.PadLeft(9, ' ')); sb.Append(Helper.StringBlankFillDigits7(data.PassCount.ToString()));
sb.Append(Helper.StringBlankFillDigits7(data.TotalNGCount.ToString()));
sb.Append(Helper.StringBlankFillDigits9(data.TotalCount.ToString()));
sb.Append(string.Format("{0:D2}", lane)); sb.Append(string.Format("{0:D2}", lane));
@ -8870,12 +8875,12 @@ namespace INT69DC_7C.Forms
return sb.ToString(); return sb.ToString();
} }
public string Protocol_OPT6(SystemConfigurationItem system, WeightData data, int lane) public string Protocol_OPT6(SystemConfigurationItem system, WeightData data, int lane, ProductItem pItem)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append((char)0x02); sb.Append((char)0x02);
sb.Append(this.Protocol_OPT6_NotStxEtx(system, data, lane)); sb.Append(this.Protocol_OPT6_NotStxEtx(system, data, lane, pItem));
sb.Append((char)0x03); sb.Append((char)0x03);
return sb.ToString(); return sb.ToString();
@ -11353,11 +11358,11 @@ namespace INT69DC_7C.Forms
#region OPT6 - 중량 데이터 피드백 (수량 포함) #region OPT6 - 중량 데이터 피드백 (수량 포함)
public void SerialCH3OPT6(int lane, WeightData data) public void SerialCH3OPT6(int lane, WeightData data)
{ {
this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx(this.SystemConfig, data, lane)); this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx(this.SystemConfig, data, lane, this.CurrentProductItem));
} }
public void SerialCH3OPT6(Collection<WeightData> datas) public void SerialCH3OPT6(Collection<WeightData> datas)
{ {
this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx_1(this.SystemConfig, datas)); this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx_1(this.SystemConfig, datas, this.CurrentProductItem));
} }
#endregion #endregion

View File

@ -394,6 +394,58 @@ namespace INT69DC_7C
else else
return "0000000"; return "0000000";
} }
/// <summary>
/// 7자리에 맞춰 공백을 빈칸으로 채움
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static string StringBlankFillDigits7(string value)
{
if (value.Length == 1)
return string.Format(" {0}", value);
else if (value.Length == 2)
return string.Format(" {0}", value);
else if (value.Length == 3)
return string.Format(" {0}", value);
else if (value.Length == 4)
return string.Format(" {0}", value);
else if (value.Length == 5)
return string.Format(" {0}", value);
else if (value.Length == 6)
return string.Format(" {0}", value);
else if (value.Length == 7)
return value;
else
return " ";
}
/// <summary>
/// 9자리에 맞춰 공백을 빈칸으로 채움
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static string StringBlankFillDigits9(string value)
{
if (value.Length == 1)
return string.Format(" {0}", value);
else if (value.Length == 2)
return string.Format(" {0}", value);
else if (value.Length == 3)
return string.Format(" {0}", value);
else if (value.Length == 4)
return string.Format(" {0}", value);
else if (value.Length == 5)
return string.Format(" {0}", value);
else if (value.Length == 6)
return string.Format(" {0}", value);
else if (value.Length == 7)
return string.Format(" {0}", value);
else if (value.Length == 8)
return string.Format(" {0}", value);
else if (value.Length == 9)
return value;
else
return " ";
}
/// <summary> /// <summary>
/// 2로 나눈 나머지값 리턴 /// 2로 나눈 나머지값 리턴

View File

@ -32,8 +32,18 @@
serialRcvPacketStrMsgCallback serialRcvPacketStrMsgCallback
serialRcvErrPacketStrMsgCallback serialRcvErrPacketStrMsgCallback
@ Ver 12.2.3 by LSJ
- 2025.03.13
- Ver 12.2.2 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 영테크팩 요청사항 추가
OP6 프로토콜 수정
중량 설정값 추가
OPT6 : STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]
--> STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]
@ Ver 12.2.2 by LSJ @ Ver 12.2.2 by LSJ
- 2025.02.04 - 2025.03.04
- Ver 12.2.1 Modify - Ver 12.2.1 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20) - Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 영문 버그 수정 - 영문 버그 수정