SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

버그 수정 중

main
DESKTOP-999R8N3\CJY 2024-04-19 11:29:47 +09:00
parent 5eaf16a954
commit c2213b4193
5 changed files with 81 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
INT_PT002/Controls/User/ControlMenuUserUserEditor.cs
View File

@ -111,10 +111,9 @@ namespace INT_PT002.Controls
this.labelIDBackGround.BackGroundColor = Color.Silver;
}
}
private void SetEnablePassword(bool value)
private void SetEnablePasswordTextBox(bool value)
{
this.textBoxPassword.Enabled = value;
this.buttonPasswordReset.Enabled = value;
if (value == true)
{
@ -508,7 +507,7 @@ namespace INT_PT002.Controls
this.KeyboardClose();
this.SetEnableID(true);
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.SetEnableLevelButton(true);
this.buttonDelete.Visible = false;
@ -658,9 +657,15 @@ namespace INT_PT002.Controls
if (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Admin
|| this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Developer)
this.SetEnablePassword(true);
{
this.SetEnablePasswordTextBox(true);
this.buttonPasswordReset.Enabled = true;
}
else
this.SetEnablePassword(false);
{
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
}
}
else
{
@ -719,12 +724,14 @@ namespace INT_PT002.Controls
this.SetEnableLevelButton(false);
this.SetEnableExpireDate(false);
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
}
else
{
this.SetEnableLevelButton(true);
this.SetEnableExpireDate(true);
this.buttonPasswordReset.Enabled = true;
}
}
@ -978,7 +985,8 @@ namespace INT_PT002.Controls
int index = this.listBoxUserList.SelectItemIndex;
this.IsNew = false;
this.SetEnablePassword(false);
this.SetEnablePasswordTextBox(false);
this.buttonPasswordReset.Enabled = false;
//this.labelAutomaticLogoutTime.Enabled = true;
this.buttonSave.Visible = false;
if (this.buttonPasswordReset.ButtonText != "Reset")
@ -987,7 +995,7 @@ namespace INT_PT002.Controls
if (index == 0)
{
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index].ToString());
this.SetEnablePassword(true);
this.SetEnablePasswordTextBox(true);
this.buttonPasswordReset.ButtonText = "Edit";
}
else if (index < 0)

3
INT_PT002/Forms/FormMain.cs
View File

@ -1574,6 +1574,7 @@ namespace INT_PT002.Forms
// 화면 표시
this.ChildFormMainDisplay.UpdateDisplayJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData10(this.CurrentLeakDatas[9]);
this.ChildFormMainDisplay.UpdateDisplayJudgmentTrackingData(this.CurrentLeakData);
#endregion
break;
case "Z":
@ -1698,6 +1699,8 @@ namespace INT_PT002.Forms
break;
}
this.Update30000ModbusItem();
}
catch
{

38
INT_PT002/Forms/FormMainDisplay3.Designer.cs generated
View File

@ -32,8 +32,8 @@
this.smartForm1 = new SmartX.SmartForm();
this.pictureBoxProgress0_2 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_910 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_67 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_8 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_6 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2_78 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress2 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress1 = new System.Windows.Forms.PictureBox();
this.pictureBoxProgress3 = new System.Windows.Forms.PictureBox();
@ -154,8 +154,8 @@
this.smartForm1.CenterLocation = false;
this.smartForm1.Controls.Add(this.pictureBoxProgress0_2);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_910);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_67);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_8);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_6);
this.smartForm1.Controls.Add(this.pictureBoxProgress2_78);
this.smartForm1.Controls.Add(this.pictureBoxProgress2);
this.smartForm1.Controls.Add(this.pictureBoxProgress1);
this.smartForm1.Controls.Add(this.pictureBoxProgress3);
@ -287,22 +287,22 @@
this.pictureBoxProgress2_910.Name = "pictureBoxProgress2_910";
this.pictureBoxProgress2_910.Size = new System.Drawing.Size(190, 140);
//
// pictureBoxProgress2_67
// pictureBoxProgress2_6
//
this.pictureBoxProgress2_67.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_67.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_67.Image")));
this.pictureBoxProgress2_67.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_67.Name = "pictureBoxProgress2_67";
this.pictureBoxProgress2_67.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_6.Image")));
this.pictureBoxProgress2_6.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_6.Name = "pictureBoxProgress2_6";
this.pictureBoxProgress2_6.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_6.Visible = false;
//
// pictureBoxProgress2_8
// pictureBoxProgress2_78
//
this.pictureBoxProgress2_8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_8.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_8.Image")));
this.pictureBoxProgress2_8.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_8.Name = "pictureBoxProgress2_8";
this.pictureBoxProgress2_8.Size = new System.Drawing.Size(190, 140);
this.pictureBoxProgress2_78.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38)))));
this.pictureBoxProgress2_78.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress2_78.Image")));
this.pictureBoxProgress2_78.Location = new System.Drawing.Point(336, 549);
this.pictureBoxProgress2_78.Name = "pictureBoxProgress2_78";
this.pictureBoxProgress2_78.Size = new System.Drawing.Size(190, 140);
//
// pictureBoxProgress2
//
@ -2806,8 +2806,8 @@
private SmartX.SmartLabel labelNumber7;
private SmartX.SmartLabel labelNumber6;
private SmartX.SmartLabel labelNumber5;
private System.Windows.Forms.PictureBox pictureBoxProgress2_67;
private System.Windows.Forms.PictureBox pictureBoxProgress2_8;
private System.Windows.Forms.PictureBox pictureBoxProgress2_6;
private System.Windows.Forms.PictureBox pictureBoxProgress2_78;
private System.Windows.Forms.PictureBox pictureBoxProgress2_910;
private System.Windows.Forms.PictureBox pictureBoxProgress0_2;
}

78
INT_PT002/Forms/FormMainDisplay3.cs
View File

@ -846,8 +846,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -857,8 +857,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.BringToFront();
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -869,8 +869,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = true;
this.pictureBoxProgress1_34.BringToFront();
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -880,8 +880,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = true;
this.pictureBoxProgress2_5.BringToFront();
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -891,9 +891,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = true;
this.pictureBoxProgress2_67.BringToFront();
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = true;
this.pictureBoxProgress2_6.BringToFront();
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -902,9 +902,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = true;
this.pictureBoxProgress2_8.BringToFront();
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = true;
this.pictureBoxProgress2_78.BringToFront();
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -914,8 +914,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = true;
this.pictureBoxProgress2_910.BringToFront();
this.pictureBoxProgress3_11.Visible = false;
@ -925,8 +925,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = true;
this.pictureBoxProgress3_11.BringToFront();
@ -1031,8 +1031,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1045,8 +1045,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.BringToFront();
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1059,8 +1059,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = true;
this.pictureBoxProgress1_34.BringToFront();
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1072,25 +1072,25 @@ namespace INT_PT002.Forms
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = true;
this.pictureBoxProgress2_5.BringToFront();
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
case Define.E_ProcessStatus._6_VacuumStart:
case Define.E_ProcessStatus._7_VacuumHold:
this.ProcessStatusStep3(status);
this.pictureBoxProgress0_1.Visible = false;
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = true;
this.pictureBoxProgress2_67.BringToFront();
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = true;
this.pictureBoxProgress2_6.BringToFront();
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
case Define.E_ProcessStatus._7_VacuumHold:
case Define.E_ProcessStatus._8_Judgment:
this.ProcessStatusStep3(status);
@ -1098,9 +1098,9 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = true;
this.pictureBoxProgress2_8.BringToFront();
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = true;
this.pictureBoxProgress2_78.BringToFront();
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = false;
break;
@ -1112,8 +1112,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = true;
this.pictureBoxProgress2_910.BringToFront();
this.pictureBoxProgress3_11.Visible = false;
@ -1125,8 +1125,8 @@ namespace INT_PT002.Forms
this.pictureBoxProgress0_2.Visible = false;
this.pictureBoxProgress1_34.Visible = false;
this.pictureBoxProgress2_5.Visible = false;
this.pictureBoxProgress2_67.Visible = false;
this.pictureBoxProgress2_8.Visible = false;
this.pictureBoxProgress2_6.Visible = false;
this.pictureBoxProgress2_78.Visible = false;
this.pictureBoxProgress2_910.Visible = false;
this.pictureBoxProgress3_11.Visible = true;
this.pictureBoxProgress3_11.BringToFront();
@ -1431,6 +1431,10 @@ namespace INT_PT002.Forms
this.ChildControl.UpdateStartLeakDataDisplay10(data);
this.SetLabelNumberColor(9, this.ColorNumberUnSelected);
}
public void UpdateDisplayJudgmentTrackingData(LeakData datas)
{
this.ParentForm.TrackingInspectionData(datas);
}
public void UpdateDisplayRecipeData(Recipe data)
{

4
INT_PT002/Forms/FormMainDisplay3.resx
View File

@ -1478,7 +1478,7 @@
VW+RVtFZ1Rvp3OT/A154OgKoXZtMAAAAAElFTkSuQmCC
</value>
</data>
<data name="pictureBoxProgress2_67.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="pictureBoxProgress2_6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAL4AAACMCAIAAABNpIRsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -1911,7 +1911,7 @@
R1d4vN8pAAAAAABJRU5ErkJggg==
</value>
</data>
<data name="pictureBoxProgress2_8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="pictureBoxProgress2_78.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAL4AAACMCAIAAABNpIRsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp