This commit is contained in:
chi
2023-02-02 20:47:21 +09:00
parent f8842333a0
commit f5b0e77af3
19 changed files with 1047 additions and 288 deletions

View File

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

View File

@@ -57,6 +57,9 @@
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.sPR구매ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_project = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -77,6 +80,7 @@
this.aLLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -139,7 +143,6 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -361,12 +364,39 @@
//
// mn_purchase
//
this.mn_purchase.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.cR구매ToolStripMenuItem,
this.sPR구매ToolStripMenuItem});
this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image")));
this.mn_purchase.Name = "mn_purchase";
this.mn_purchase.Size = new System.Drawing.Size(203, 24);
this.mn_purchase.Text = "구매신청";
this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// 일반구매ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "일반구매ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Text = "NR 구매";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// cR구매ToolStripMenuItem
//
this.cR구매ToolStripMenuItem.ForeColor = System.Drawing.Color.Blue;
this.cR구매ToolStripMenuItem.Name = "cR구매ToolStripMenuItem";
this.cR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.cR구매ToolStripMenuItem.Text = "CR 구매";
this.cR구매ToolStripMenuItem.Click += new System.EventHandler(this.cR구매ToolStripMenuItem_Click);
//
// sPR구매ToolStripMenuItem
//
this.sPR구매ToolStripMenuItem.Enabled = false;
this.sPR구매ToolStripMenuItem.Name = "sPR구매ToolStripMenuItem";
this.sPR구매ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.sPR구매ToolStripMenuItem.Text = "SPR 구매";
this.sPR구매ToolStripMenuItem.Click += new System.EventHandler(this.sPR구매ToolStripMenuItem_Click);
//
// mn_project
//
this.mn_project.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -415,21 +445,21 @@
// 목록ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(180, 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(134, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(134, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Text = "양식";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -533,6 +563,13 @@
this.ToolStripMenuItem.Text = "라인코드관리";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 프로그램사용관련알림ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
this.ToolStripMenuItem.Text = "프로그램 사용 관련 알림";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 휴가관리ToolStripMenuItem
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1069,13 +1106,6 @@
this.toolStripButton3.ToolTipText = "휴가신청";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// 프로그램사용관련알림ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "프로그램사용관련알림ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(233, 24);
this.ToolStripMenuItem.Text = "프로그램 사용 관련 알림";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1218,6 +1248,9 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem12;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cR구매ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem sPR구매ToolStripMenuItem;
}
}

View File

@@ -459,14 +459,28 @@ namespace Project
void menu_nrpurchase()
{
string formkey = "PUCHASE";
string formkey = "PUCHASENR";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fPurchase());
AddForm(formkey, new FEQ0000.fPurchase(),"NR구매");
}
void menu_crpurchase()
{
FCOMMON.Util.MsgE("CR구매현황은 신규 개발 기능으로 아직 open 되지 않았습니다");
string formkey = "PUCHASECR";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fPurchase(),"CR구매");
}
void menu_sprpurchase()
{
FCOMMON.Util.MsgE("SPR구매현황은 신규 개발 기능으로 아직 open 되지 않았습니다");
string formkey = "PUCHASESPR";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fPurchase(), "SPR구매");
}
private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_nrpurchase();
}
private void purchaseImportToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1301,5 +1315,20 @@ namespace Project
}
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_nrpurchase();
}
private void cR구매ToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_crpurchase();
}
private void sPR구매ToolStripMenuItem_Click(object sender, EventArgs e)
{
menu_sprpurchase();
}
}
}

View File

@@ -452,14 +452,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
/U7m/E+5XP8/92TF/3lzYj/UbMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtEb8vV7o9blnWyHc
/U7m/E+5XP8/92TF/3lzYj/UrMn/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8vtIb8vV7o9blnWyHc
gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
v2iNEH9c5vn/SobhnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
v2iNEH9c5vn/SobunyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bLgd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP6XrU3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQDvi6uR57RFnwAAAABJRU5ErkJggg==
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bDgd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP6HjfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQCro6tjRV7j6gAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">