This commit is contained in:
chi
2021-12-20 12:42:18 +09:00
parent 19525c71b6
commit 4cf24cedaf
31 changed files with 2585 additions and 565 deletions

View File

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

View File

@@ -121,6 +121,8 @@
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -382,21 +384,21 @@
// 목록ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem1.Text = "목록";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// 자동입력ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem.Text = "자동입력";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 양식ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "양식ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem.Text = "양식";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -445,14 +447,14 @@
// 관리ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "관리ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.ToolStripMenuItem.Text = "재고 관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 재고현황ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "재고현황ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.ToolStripMenuItem.Text = "재고 현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -460,7 +462,7 @@
//
this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem";
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.pMP현황ToolStripMenuItem.Text = "PMP 현황";
this.pMP현황ToolStripMenuItem.Visible = false;
this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click);
@@ -498,6 +500,8 @@
// 휴가관리ToolStripMenuItem
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.toolStripMenuItem9,
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato;
@@ -510,14 +514,14 @@
// 근태입력ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "근태입력ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(148, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.ToolStripMenuItem.Text = "근태입력";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 근로명부ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "근로명부ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(148, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.ToolStripMenuItem.Text = "근로자명부";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -563,39 +567,39 @@
// 메모장ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메모장";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6);
//
// 패치내역ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem1.Text = "패치 내역";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// 메일내역ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메일 내역";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6);
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Visible = false;
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -604,7 +608,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -613,7 +617,7 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -621,7 +625,7 @@
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -629,7 +633,7 @@
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -638,7 +642,7 @@
//
this.ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메일전송";
this.ToolStripMenuItem.Visible = false;
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
@@ -647,7 +651,7 @@
//
this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red;
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24);
this.toolStripMenuItem5.Text = "(test)휴가등록";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
@@ -833,7 +837,7 @@
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.ShowToolTips = true;
this.tabControl1.Size = new System.Drawing.Size(1062, 594);
this.tabControl1.Size = new System.Drawing.Size(1065, 594);
this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
this.tabControl1.TabIndex = 34;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
@@ -849,9 +853,9 @@
this.toolStripMenuItem6,
this.toolStripButton1,
this.toolStripButton2});
this.toolStrip1.Location = new System.Drawing.Point(1063, 28);
this.toolStrip1.Location = new System.Drawing.Point(1066, 28);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(32, 594);
this.toolStrip1.Size = new System.Drawing.Size(29, 594);
this.toolStrip1.TabIndex = 35;
this.toolStrip1.Text = "toolStrip1";
//
@@ -860,7 +864,7 @@
this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image")));
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem8.Text = "업무일지";
this.toolStripMenuItem8.ToolTipText = "업무일지";
this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
@@ -870,7 +874,7 @@
this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image")));
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem7.Text = "구매신청";
this.toolStripMenuItem7.ToolTipText = "구매신청";
this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
@@ -880,7 +884,7 @@
this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20);
this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20);
this.toolStripMenuItem6.Text = "프로젝트";
this.toolStripMenuItem6.ToolTipText = "프로젝트";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
@@ -891,7 +895,7 @@
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(29, 20);
this.toolStripButton1.Size = new System.Drawing.Size(26, 20);
this.toolStripButton1.Text = "구매진행상황";
this.toolStripButton1.ToolTipText = "구매진행상황";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2);
@@ -902,10 +906,22 @@
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(29, 20);
this.toolStripButton2.Size = new System.Drawing.Size(26, 20);
this.toolStripButton2.Text = "품목정보";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//
// toolStripMenuItem9
//
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
this.toolStripMenuItem9.Size = new System.Drawing.Size(198, 6);
//
// 휴일연장근무승인ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(201, 24);
this.ToolStripMenuItem.Text = "휴일/연장근무 승인";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1029,6 +1045,8 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem9;
}
}

View File

@@ -1063,5 +1063,12 @@ namespace Project
{
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "OTCONFIRM";
if (!ShowForm(formkey))
AddForm(formkey, new FPJ0000.fOTConfirm());
}
}
}

View File

@@ -431,20 +431,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">