바이패스 버그 수정
parent
03cfdaeb9f
commit
8dc1c7e353
|
@ -613,9 +613,9 @@ namespace ITC81DB_2H.Controls
|
|||
this.ParentForm.Part11AutomaticLogoutReset();
|
||||
|
||||
if (this.buttonBypassDirection.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
|
||||
this.ParentForm.ParentForm.SystemConfig2.IsBypassDirectionPass = false;
|
||||
this.ParentForm.ParentForm.IsBypassDirectionPass = false;
|
||||
else
|
||||
this.ParentForm.ParentForm.SystemConfig2.IsBypassDirectionPass = true;
|
||||
this.ParentForm.ParentForm.IsBypassDirectionPass = true;
|
||||
}
|
||||
private void buttonBypassOnce_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
@ -625,12 +625,12 @@ namespace ITC81DB_2H.Controls
|
|||
|
||||
if (this.buttonBypassOnce.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
|
||||
{
|
||||
this.ParentForm.ParentForm.SystemConfig2.IsBypassOnce = false;
|
||||
this.ParentForm.ParentForm.IsBypassOnce = false;
|
||||
this.buttonBypassRun.Mode = SmartButton.BUTTONMODE.PUSH;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.ParentForm.ParentForm.SystemConfig2.IsBypassOnce = true;
|
||||
this.ParentForm.ParentForm.IsBypassOnce = true;
|
||||
this.buttonBypassRun.Mode = SmartButton.BUTTONMODE.NORMAL;
|
||||
}
|
||||
}
|
||||
|
@ -640,9 +640,14 @@ namespace ITC81DB_2H.Controls
|
|||
if (this.ParentForm.ParentForm.SystemConfig3.IsPart11 == true)
|
||||
this.ParentForm.Part11AutomaticLogoutReset();
|
||||
|
||||
if (this.ParentForm.ParentForm.SystemConfig2.IsBypassOnce == true)
|
||||
if (this.buttonBypassOnce.ButtonStatus == SmartButton.BUTSTATUS.UP)
|
||||
{
|
||||
if (this.ParentForm.ParentForm.SystemConfig2.IsBypassDirectionPass == true)
|
||||
this.ParentForm.ParentForm.IsBypassOnce = true;
|
||||
this.ParentForm.ParentForm.IsBypassUse = true;
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightBigScreen.UpdateSpotOrBypassImageVisibleStatus(true);
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightSmall.UpdateSpotOrBypassImageVisibleStatus(true);
|
||||
|
||||
if (this.ParentForm.ParentForm.IsBypassDirectionPass == true)
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.BypassOnce, CommunicationID.MainBoard);
|
||||
else
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.ByNGOnce, CommunicationID.MainBoard);
|
||||
|
@ -655,8 +660,11 @@ namespace ITC81DB_2H.Controls
|
|||
{
|
||||
this.buttonBypassDirection.Enabled = false;
|
||||
this.buttonBypassOnce.Enabled = false;
|
||||
this.ParentForm.ParentForm.IsBypassUse = true;
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightBigScreen.UpdateSpotOrBypassImageVisibleStatus(true);
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightSmall.UpdateSpotOrBypassImageVisibleStatus(true);
|
||||
|
||||
if (this.ParentForm.ParentForm.SystemConfig2.IsBypassDirectionPass == true)
|
||||
if (this.ParentForm.ParentForm.IsBypassDirectionPass == true)
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.BypassON, CommunicationID.MainBoard);
|
||||
else
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.ByNGON, CommunicationID.MainBoard);
|
||||
|
@ -667,8 +675,11 @@ namespace ITC81DB_2H.Controls
|
|||
{
|
||||
this.buttonBypassDirection.Enabled = true;
|
||||
this.buttonBypassOnce.Enabled = true;
|
||||
this.ParentForm.ParentForm.IsBypassUse = false;
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightBigScreen.UpdateSpotOrBypassImageVisibleStatus(false);
|
||||
this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightSmall.UpdateSpotOrBypassImageVisibleStatus(false);
|
||||
|
||||
if (this.ParentForm.ParentForm.SystemConfig2.IsBypassDirectionPass == true)
|
||||
if (this.ParentForm.ParentForm.IsBypassDirectionPass == true)
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.BypassOFF, CommunicationID.MainBoard);
|
||||
else
|
||||
this.ParentForm.ParentForm.TransferData(CommunicationCommand.ByNGOFF, CommunicationID.MainBoard);
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
this.pictureBoxCountingOutputCount = new System.Windows.Forms.PictureBox();
|
||||
this.labelIconNET = new SmartX.SmartLabel();
|
||||
this.labelWeight = new SmartX.SmartLabel();
|
||||
this.pictureBoxBypass = new System.Windows.Forms.PictureBox();
|
||||
this.smartGroupBox1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
|
@ -93,7 +94,7 @@
|
|||
// pictureBoxIconAir
|
||||
//
|
||||
this.pictureBoxIconAir.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconAir.Image")));
|
||||
this.pictureBoxIconAir.Location = new System.Drawing.Point(67, 43);
|
||||
this.pictureBoxIconAir.Location = new System.Drawing.Point(169, 38);
|
||||
this.pictureBoxIconAir.Name = "pictureBoxIconAir";
|
||||
this.pictureBoxIconAir.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxIconAir.Visible = false;
|
||||
|
@ -101,7 +102,7 @@
|
|||
// pictureBoxIconMetal
|
||||
//
|
||||
this.pictureBoxIconMetal.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconMetal.Image")));
|
||||
this.pictureBoxIconMetal.Location = new System.Drawing.Point(16, 115);
|
||||
this.pictureBoxIconMetal.Location = new System.Drawing.Point(16, 141);
|
||||
this.pictureBoxIconMetal.Name = "pictureBoxIconMetal";
|
||||
this.pictureBoxIconMetal.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxIconMetal.Visible = false;
|
||||
|
@ -139,7 +140,7 @@
|
|||
// pictureBoxIconZero
|
||||
//
|
||||
this.pictureBoxIconZero.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconZero.Image")));
|
||||
this.pictureBoxIconZero.Location = new System.Drawing.Point(16, 43);
|
||||
this.pictureBoxIconZero.Location = new System.Drawing.Point(16, 38);
|
||||
this.pictureBoxIconZero.Name = "pictureBoxIconZero";
|
||||
this.pictureBoxIconZero.Size = new System.Drawing.Size(45, 35);
|
||||
//
|
||||
|
@ -212,7 +213,7 @@
|
|||
// pictureBoxIconGap
|
||||
//
|
||||
this.pictureBoxIconGap.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconGap.Image")));
|
||||
this.pictureBoxIconGap.Location = new System.Drawing.Point(16, 84);
|
||||
this.pictureBoxIconGap.Location = new System.Drawing.Point(16, 110);
|
||||
this.pictureBoxIconGap.Name = "pictureBoxIconGap";
|
||||
this.pictureBoxIconGap.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxIconGap.Visible = false;
|
||||
|
@ -378,6 +379,7 @@
|
|||
//
|
||||
this.smartGroupBox1.BackPictureBox = null;
|
||||
this.smartGroupBox1.BackPictureBox1 = null;
|
||||
this.smartGroupBox1.Controls.Add(this.pictureBoxBypass);
|
||||
this.smartGroupBox1.Controls.Add(this.labelBarcodeCount);
|
||||
this.smartGroupBox1.Controls.Add(this.pictureBoxBarcodeQueueCount);
|
||||
this.smartGroupBox1.Controls.Add(this.labelUnit);
|
||||
|
@ -484,7 +486,7 @@
|
|||
// pictureBoxIconExNG2
|
||||
//
|
||||
this.pictureBoxIconExNG2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconExNG2.Image")));
|
||||
this.pictureBoxIconExNG2.Location = new System.Drawing.Point(16, 177);
|
||||
this.pictureBoxIconExNG2.Location = new System.Drawing.Point(118, 38);
|
||||
this.pictureBoxIconExNG2.Name = "pictureBoxIconExNG2";
|
||||
this.pictureBoxIconExNG2.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxIconExNG2.Visible = false;
|
||||
|
@ -492,7 +494,7 @@
|
|||
// pictureBoxIconExNG1
|
||||
//
|
||||
this.pictureBoxIconExNG1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxIconExNG1.Image")));
|
||||
this.pictureBoxIconExNG1.Location = new System.Drawing.Point(16, 146);
|
||||
this.pictureBoxIconExNG1.Location = new System.Drawing.Point(67, 38);
|
||||
this.pictureBoxIconExNG1.Name = "pictureBoxIconExNG1";
|
||||
this.pictureBoxIconExNG1.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxIconExNG1.Visible = false;
|
||||
|
@ -609,6 +611,14 @@
|
|||
this.labelWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelWeight.Wordwrap = false;
|
||||
//
|
||||
// pictureBoxBypass
|
||||
//
|
||||
this.pictureBoxBypass.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxBypass.Image")));
|
||||
this.pictureBoxBypass.Location = new System.Drawing.Point(16, 79);
|
||||
this.pictureBoxBypass.Name = "pictureBoxBypass";
|
||||
this.pictureBoxBypass.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxBypass.Visible = false;
|
||||
//
|
||||
// ControlMainDisplayWeightBigScreen
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
@ -673,5 +683,6 @@
|
|||
private System.Windows.Forms.PictureBox pictureBoxRandomModeDisable;
|
||||
private System.Windows.Forms.PictureBox pictureBoxIconExNG2;
|
||||
private System.Windows.Forms.PictureBox pictureBoxIconExNG1;
|
||||
private System.Windows.Forms.PictureBox pictureBoxBypass;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -84,6 +84,19 @@ namespace ITC81DB_2H
|
|||
else
|
||||
this.labelIconNET.Visible = false;
|
||||
}
|
||||
public void UpdateSpotOrBypassImageVisibleStatus(bool check)
|
||||
{
|
||||
this.ParentForm.ParentForm.IsBypassStart = check;
|
||||
|
||||
if (check == true)
|
||||
{
|
||||
this.pictureBoxBypass.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxBypass.Visible = false;
|
||||
}
|
||||
}
|
||||
private void UpdateDisplay()
|
||||
{
|
||||
int value = 0;
|
||||
|
|
|
@ -2236,6 +2236,65 @@
|
|||
GTRNA33fwzRN8OjeXlBdZ6GAgYL12a8K8Ifrs78lsG2bO4vjWNjwNazxUgGGlWVJt/I8tRVFpAIR+FWi
|
||||
tVzDGq8sUG28smBP46/XT3h5uy2IsmCJrPGMuwQ4qq7raHOWjWfcJdjDwQITvgAnx1xAevGfCwAAAABJ
|
||||
RU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="pictureBoxBypass.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
DbIfz/EsowwAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="pictureBoxIconExNG2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
|
|
@ -77,6 +77,7 @@
|
|||
this.labelBarcodeCount = new SmartX.SmartLabel();
|
||||
this.labelIconNET = new SmartX.SmartLabel();
|
||||
this.labelWeight = new SmartX.SmartLabel();
|
||||
this.pictureBoxBypass = new System.Windows.Forms.PictureBox();
|
||||
this.smartGroupBox1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
|
@ -362,6 +363,7 @@
|
|||
//
|
||||
this.smartGroupBox1.BackPictureBox = null;
|
||||
this.smartGroupBox1.BackPictureBox1 = null;
|
||||
this.smartGroupBox1.Controls.Add(this.pictureBoxBypass);
|
||||
this.smartGroupBox1.Controls.Add(this.labelUnit);
|
||||
this.smartGroupBox1.Controls.Add(this.pictureBoxIconExNG2);
|
||||
this.smartGroupBox1.Controls.Add(this.pictureBoxIconExNG1);
|
||||
|
@ -591,6 +593,14 @@
|
|||
this.labelWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
|
||||
this.labelWeight.Wordwrap = false;
|
||||
//
|
||||
// pictureBoxBypass
|
||||
//
|
||||
this.pictureBoxBypass.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxBypass.Image")));
|
||||
this.pictureBoxBypass.Location = new System.Drawing.Point(20, 63);
|
||||
this.pictureBoxBypass.Name = "pictureBoxBypass";
|
||||
this.pictureBoxBypass.Size = new System.Drawing.Size(45, 25);
|
||||
this.pictureBoxBypass.Visible = false;
|
||||
//
|
||||
// ControlMainDisplayWeightSmall
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
|
@ -653,5 +663,6 @@
|
|||
private System.Windows.Forms.PictureBox pictureBoxRandomModeDisable;
|
||||
private System.Windows.Forms.PictureBox pictureBoxIconExNG2;
|
||||
private System.Windows.Forms.PictureBox pictureBoxIconExNG1;
|
||||
private System.Windows.Forms.PictureBox pictureBoxBypass;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -85,6 +85,19 @@ namespace ITC81DB_2H.Controls
|
|||
else
|
||||
this.labelIconNET.Visible = false;
|
||||
}
|
||||
public void UpdateSpotOrBypassImageVisibleStatus(bool check)
|
||||
{
|
||||
this.ParentForm.ParentForm.IsBypassStart = check;
|
||||
|
||||
if (check == true)
|
||||
{
|
||||
this.pictureBoxBypass.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.pictureBoxBypass.Visible = false;
|
||||
}
|
||||
}
|
||||
private void UpdateDisplay()
|
||||
{
|
||||
int value = 0;
|
||||
|
|
|
@ -2235,6 +2235,65 @@
|
|||
DMNwYUVgsI9agBcTZQE6tkwqx5pqsGEFZRX8FmDDNLfApX4OVp+hY5/J28DqSbZASV3rv6F/7H+joES8
|
||||
WEXXCKyeZAuQsZKmzn+brMb/7q1LwFjXxR9DDUUW6HuEooQ5yDJQykFWQ5EFxGAaWyD3HwCOpzb6PKgt
|
||||
jgAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="pictureBoxBypass.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
DbIfz/EsowwAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="pictureBoxIconExNG2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
|
|
@ -3701,12 +3701,12 @@ namespace ITC81DB_2H
|
|||
}
|
||||
public int TotalNGCount
|
||||
{
|
||||
get { return this.UnderCount + this.OverCount + this.ExNGCount + this.DoubleEntryCount; }
|
||||
get { return this.UnderCount + this.OverCount + this.ExNGCount; }
|
||||
}
|
||||
|
||||
public int TotalCount
|
||||
{
|
||||
get { return this.UnderCount + this.PassCount + this.OverCount + this.ExNGCount + this.DoubleEntryCount; }
|
||||
get { return this.UnderCount + this.PassCount + this.OverCount + this.ExNGCount; }
|
||||
}
|
||||
|
||||
public double Weight
|
||||
|
|
|
@ -51,6 +51,10 @@ namespace ITC81DB_2H.Forms
|
|||
public bool IsOPCModbusUsing;
|
||||
public int FlagAutomaticLogoutWarningTime;
|
||||
public bool IsLogProcessing;
|
||||
public bool IsBypassOnce; // 바이패스
|
||||
public bool IsBypassDirectionPass; // 바이패스
|
||||
public bool IsBypassUse; // 바이패스
|
||||
public bool IsBypassStart;
|
||||
|
||||
// 재전송 기능
|
||||
public int MissingCommIDCount;
|
||||
|
@ -401,6 +405,9 @@ namespace ITC81DB_2H.Forms
|
|||
this.FlagComRetry3th = 0;
|
||||
this.MissingCommIDCount = 0;
|
||||
this.CommID = 0;
|
||||
this.IsBypassOnce = true;
|
||||
this.IsBypassDirectionPass = true;
|
||||
this.IsBypassUse = false;
|
||||
|
||||
this.QueueCommunicationRecive = new Queue<string>();
|
||||
this.CurrentAlarmList = new AlarmList();
|
||||
|
@ -3166,6 +3173,15 @@ namespace ITC81DB_2H.Forms
|
|||
this.CurrentWeightData.Weight = this.OverloadWeight;
|
||||
}
|
||||
|
||||
// 바이패스 사용 시
|
||||
if (this.IsBypassUse == true && this.IsBypassOnce == true)
|
||||
{
|
||||
this.IsBypassOnce = false;
|
||||
this.IsBypassUse = false;
|
||||
this.ChildFormMainDisplay.MainWeightBigScreen.UpdateSpotOrBypassImageVisibleStatus(false);
|
||||
this.ChildFormMainDisplay.MainWeightSmall.UpdateSpotOrBypassImageVisibleStatus(false);
|
||||
}
|
||||
|
||||
this.Update30000ModbusItem();
|
||||
|
||||
#region 통신
|
||||
|
|
|
@ -359,7 +359,7 @@
|
|||
// smartMemory1
|
||||
//
|
||||
this.smartMemory1.AutoFreeProMemoryAlarmPercent = 0;
|
||||
this.smartMemory1.ParentWindow = this;
|
||||
this.smartMemory1.ParentWindow = null;
|
||||
//
|
||||
// buttonWeightInputMode
|
||||
//
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue