Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

프로젝트 관련 업데이트

Browse Source
This commit is contained in:
chikyun.kim
2019-01-25 10:38:59 +09:00
parent a45bf77419
commit b8aeffa10a
17 changed files with 3636 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("19.01.15.1100")]
[assembly: AssemblyFileVersion("19.01.15.1100")]
[assembly: AssemblyVersion("19.01.25.0900")]
[assembly: AssemblyFileVersion("19.01.25.0900")]

184
Project/fMain.Designer.cs generated
View File

@@ -32,6 +32,12 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMain));
this.tmDisplay = new System.Windows.Forms.Timer(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.toolStrip = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.bw = new System.ComponentModel.BackgroundWorker();
this.cmTab = new System.Windows.Forms.ContextMenuStrip(this.components);
this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -79,19 +85,15 @@
this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.projectImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
this.프로젝트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip.SuspendLayout();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.toolStrip.SuspendLayout();
this.tabControl1.SuspendLayout();
this.toolStripContainer1.ContentPanel.SuspendLayout();
this.toolStripContainer1.LeftToolStripPanel.SuspendLayout();
@@ -103,6 +105,76 @@
this.tmDisplay.Interval = 300;
this.tmDisplay.Tick += new System.EventHandler(this.tmDisplay_Tick);
//
// toolStrip
//
this.toolStrip.Dock = System.Windows.Forms.DockStyle.None;
this.toolStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1,
this.toolStripButton2,
this.toolStripButton3,
this.toolStripButton4,
this.toolStripButton5});
this.toolStrip.Location = new System.Drawing.Point(0, 4);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(25, 146);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매");
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton3
//
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "프로젝트";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
this.toolStripButton4.Text = "개인 인벤토리";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripButton5
//
this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// bw
//
this.bw.WorkerReportsProgress = true;
@@ -369,7 +441,8 @@
this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.equipmentToolStripMenuItem,
this.personalInventoryToolStripMenuItem,
this.nRPurchaseToolStripMenuItem});
this.nRPurchaseToolStripMenuItem,
this.프로젝트ToolStripMenuItem});
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.managementToolStripMenuItem.Text = "관리";
@@ -447,7 +520,8 @@
this.purchaseImportToolStripMenuItem,
this.materialImportToolStripMenuItem,
this.purchaseDataConvertToolStripMenuItem,
this.customerImportToolStripMenuItem});
this.customerImportToolStripMenuItem,
this.projectImportToolStripMenuItem});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(91, 23);
@@ -482,75 +556,12 @@
this.customerImportToolStripMenuItem.Text = "Customer Import";
this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click);
//
// toolStrip
// projectImportToolStripMenuItem
//
this.toolStrip.Dock = System.Windows.Forms.DockStyle.None;
this.toolStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1,
this.toolStripButton2,
this.toolStripButton3,
this.toolStripButton4,
this.toolStripButton5});
this.toolStrip.Location = new System.Drawing.Point(0, 4);
this.toolStrip.Name = "toolStrip";
this.toolStrip.Size = new System.Drawing.Size(32, 165);
this.toolStrip.TabIndex = 32;
this.toolStrip.Text = "ToolStrip";
this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매");
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(30, 24);
this.toolStripButton1.Text = "메일전송";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(30, 24);
this.toolStripButton2.Text = "구매신청";
this.toolStripButton2.ToolTipText = "파트구매신청서 작성";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton3
//
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(30, 24);
this.toolStripButton3.Text = "toolStripButton3";
this.toolStripButton3.ToolTipText = "프로젝트";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(30, 24);
this.toolStripButton4.Text = "개인 인벤토리";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripButton5
//
this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(30, 24);
this.toolStripButton5.Text = "toolStripButton5";
this.toolStripButton5.ToolTipText = "로그인/로그아웃";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem";
this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24);
this.projectImportToolStripMenuItem.Text = "Project Import";
this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click);
//
// tabControl1
//
@@ -563,7 +574,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1002, 569);
this.tabControl1.Size = new System.Drawing.Size(1009, 569);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -576,7 +587,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(10);
this.tabPage1.Size = new System.Drawing.Size(994, 536);
this.tabPage1.Size = new System.Drawing.Size(1001, 536);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "요약";
//
@@ -586,7 +597,7 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1002, 569);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569);
this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load);
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
//
@@ -599,6 +610,13 @@
this.toolStripContainer1.TabIndex = 35;
this.toolStripContainer1.Text = "toolStripContainer1";
//
// 프로젝트ToolStripMenuItem
//
this.프로젝트ToolStripMenuItem.Name = "프로젝트ToolStripMenuItem";
this.프로젝트ToolStripMenuItem.Size = new System.Drawing.Size(154, 24);
this.프로젝트ToolStripMenuItem.Text = "프로젝트";
this.프로젝트ToolStripMenuItem.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -616,13 +634,13 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = " ";
this.Load += new System.EventHandler(this.@__Load);
this.toolStrip.ResumeLayout(false);
this.toolStrip.PerformLayout();
this.cmTab.ResumeLayout(false);
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.toolStrip.ResumeLayout(false);
this.toolStrip.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.toolStripContainer1.ContentPanel.ResumeLayout(false);
this.toolStripContainer1.LeftToolStripPanel.ResumeLayout(false);
@@ -694,6 +712,8 @@
private System.Windows.Forms.ToolStripButton toolStripButton5;
private System.Windows.Forms.ToolStripMenuItem 패치내역ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 프로젝트ToolStripMenuItem;
}
}

12
Project/fMain.cs
View File

@@ -499,9 +499,19 @@ namespace Project
private void materialImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.fMaterial_Import();
// f.MdiParent = this;
f.Show();
}
private void projectImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FPJ0000.Import();
f.Show();
}
private void 프로젝트ToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_projecT_list();
}
}
}

40
Project/fMain.resx
View File

@@ -123,18 +123,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>124, 17</value>
</metadata>
<metadata name="bw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>306, 17</value>
</metadata>
<metadata name="cmTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>374, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>592, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>476, 17</value>
</metadata>
<metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>709, 17</value>
</metadata>
@@ -155,14 +143,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad
+65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/E9ry/tXX+/3bPKHw39dzrf/3
T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d
W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/1Ebe/7GzKt4C9UKAUnN
zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV
3//t93YTNKB+++QfcXNKW6BaEcA5svfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j
51X+SJhZYQrVhgBJzR2nHLpa/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW
q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q
ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgB0E6FjQKK3FgAAAABJRU5ErkJggg==
Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/fS15/+rr/f5t7Cv89/Vc6//9
U1J/zq71OLoqNJQZqg0B4hu7PresnfV/1sml//v2z/rfvHXC//I1rf/TF1b+j59T/j9vcfX/hlW1/2vn
FvwqmphyLG52eQxUKwSktXReqZ0//f+uB3sx8Pa7u/+vurLx/9zTy/5PODj3f8TGnr8x8yreQrVCQFJz
8+L43v7fME09+2ZipUF4zqll/5MXVF2AaoWApNbW1PT6+j8wRXFzyrDSIAxyRfy88tVQrRCQ0tEhk1bV
93/7vd0EDajfPvlH3JzSFqhWBHAM7/278Pg6sCJ8Xihe0/4xdk5ZKlQbAiTWd7/rWjcfrhAb3nRr+//o
eZU/EmZWmEK1IUBSc8cp+66Wv0n9+d9hOHp+xY/o+ZVwnDgl62fygpp+qBZUkFbRl5Fa2bcVyiUdpJb1
6qaVt79Pqeo3gAqRDjJqJx7OqK7/l1kz6X9aZT8KzqiZ+D8+fuLvnLop2L0AAtFV9T/mrDv0Pz2//ztU
CA7wycFBJtD0+PgJv7NrJ/dAheAAVY6BAQBJ3qFUfc76hgAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -209,6 +197,18 @@
SUVORK5CYII=
</value>
</data>
<metadata name="bw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>306, 17</value>
</metadata>
<metadata name="cmTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>374, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>592, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>476, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>77</value>
</metadata>