This commit is contained in:
chi
2021-02-22 20:13:19 +09:00
parent 55510b84b8
commit 71698b5d8b
138 changed files with 19619 additions and 6658 deletions

View File

@@ -121,12 +121,18 @@ namespace Project
tmDisplay.Start(); //display timer
Func_Login();
Update_Site();
bw.RunWorkerAsync(); //background worker
//사용기록추적
Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
//서버ON
try
{
@@ -384,7 +390,7 @@ namespace Project
{
string formkey = "EQBUMP";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP), "BUMP");
}
@@ -392,7 +398,7 @@ namespace Project
{
string formkey = "EQMOLD";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD), "MOLD_EOL");
}
@@ -402,7 +408,7 @@ namespace Project
string formkey = "EQFOL";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL), "FOL");
}
@@ -582,7 +588,7 @@ namespace Project
}
return false;
}
void AddForm(string key, Form f)
void AddForm(string key, Form f, string Title = "")
{
f.TopLevel = false;
f.Dock = DockStyle.Fill;
@@ -590,7 +596,7 @@ namespace Project
f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
f.FormClosed += f_FormClosed;
f.Tag = key;
this.tabControl1.TabPages.Add(key, f.Text);
this.tabControl1.TabPages.Add(key, (Title.isEmpty() ? f.Text : Title));
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BorderStyle = BorderStyle.Fixed3D;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Padding = new Padding(10, 10, 10, 10);
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BackColor = Color.LightGray;
@@ -716,7 +722,7 @@ namespace Project
private void ToolStripMenuItem1_Click(object sender, EventArgs e)
{
}
private void ToolStripMenuItem1_Click(object sender, EventArgs e)
@@ -727,7 +733,7 @@ namespace Project
private void workReportImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FPJ0000.JobReport.fJobReportImport();
var f = new FPJ0000.JobReport_.fJobReportImport();
f.ShowDialog();
}