This commit is contained in:
chi
2023-08-09 15:21:40 +09:00
parent 20e36a3624
commit c34372e262
20 changed files with 2401 additions and 907 deletions

View File

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

View File

@@ -92,6 +92,7 @@
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.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -116,6 +117,8 @@
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btDev = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.purchaseOrderImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -149,8 +152,6 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -376,6 +377,7 @@
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.managementToolStripMenuItem.Text = "관리";
this.managementToolStripMenuItem.Click += new System.EventHandler(this.managementToolStripMenuItem_Click);
//
// mn_purchase
//
@@ -615,6 +617,7 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.toolStripMenuItem10,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
@@ -670,6 +673,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(248, 24);
this.ToolStripMenuItem.Text = "개인별 근태 집계표";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
@@ -886,6 +896,21 @@
this.btDev.Text = "개발자메뉴";
this.btDev.Visible = false;
//
// 메일전송ToolStripMenuItem1
//
this.ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.REMINDToolStripMenuItem});
this.ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24);
this.ToolStripMenuItem1.Text = "메일전송";
//
// 휴가REMINDToolStripMenuItem
//
this.REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem";
this.REMINDToolStripMenuItem.Size = new System.Drawing.Size(166, 24);
this.REMINDToolStripMenuItem.Text = "휴가-REMIND";
this.REMINDToolStripMenuItem.Click += new System.EventHandler(this.REMINDToolStripMenuItem_Click);
//
// purchaseImportToolStripMenuItem
//
this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem";
@@ -1161,21 +1186,6 @@
this.toolStripButton3.ToolTipText = "휴가신청";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// 메일전송ToolStripMenuItem1
//
this.ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.REMINDToolStripMenuItem});
this.ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24);
this.ToolStripMenuItem1.Text = "메일전송";
//
// 휴가REMINDToolStripMenuItem
//
this.REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem";
this.REMINDToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.REMINDToolStripMenuItem.Text = "휴가-REMIND";
this.REMINDToolStripMenuItem.Click += new System.EventHandler(this.REMINDToolStripMenuItem_Click);
//
// fMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1329,6 +1339,7 @@
private System.Windows.Forms.ToolStripMenuItem bwrunToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem REMINDToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
}
}

View File

@@ -1444,5 +1444,17 @@ namespace Project
{
Mail_Take_a_rest_remind();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
var f = new FBS0000.fHolyDayDataSum(DateTime.Now.ToShortDateString(), uid);
f.Show();
}
private void managementToolStripMenuItem_Click(object sender, EventArgs e)
{
}
}
}

View File

@@ -452,14 +452,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
/U7m/E+5XP8/92TF/3lzYj/ULMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+Ptnr+vV7o9blnWyHc
/U7m/E+5XP8/92TF/3lzYj/UzM//l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
/4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8Pt7r/vV7o9blnWyHc
gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bpgd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP7TZfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQAOjqr9dEfZwgAAAABJRU5ErkJggg==
Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bxgd7fQPo/MoaKnQGr
2d+jAdUG1LhtIjtQcP7jJfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
BQDzP6rrBTxFGAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">