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

원장추가

Browse Source
This commit is contained in:
chi
2022-02-02 15:10:09 +09:00
parent 552c3f9389
commit 6bf9641682
18 changed files with 4899 additions and 61 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("22.02.02.0030")]
[assembly: AssemblyFileVersion("22.02.02.0030")]
[assembly: AssemblyVersion("22.02.02.1500")]
[assembly: AssemblyFileVersion("22.02.02.1500")]

11
Project/fMain.Designer.cs generated
View File

@@ -81,6 +81,7 @@
this.toolStripMenuItem9 = 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.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -510,6 +511,7 @@
this.toolStripMenuItem9,
this.근태입력ToolStripMenuItem,
this.휴가신청ToolStripMenuItem,
this.개인별근태원장ToolStripMenuItem,
this.toolStripMenuItem10,
this.출근부출력ToolStripMenuItem,
this.휴가사용현황ToolStripMenuItem,
@@ -555,6 +557,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";
@@ -580,6 +589,7 @@
this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem";
this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
this.근로명부ToolStripMenuItem.Text = "근로자명부";
this.근로명부ToolStripMenuItem.Visible = false;
this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click);
//
// personalInventoryToolStripMenuItem
@@ -1102,6 +1112,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5;
private System.Windows.Forms.ToolStripMenuItem 아이템비활성화하기ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 휴가사용현황ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 개인별근태원장ToolStripMenuItem;
}
}

31
Project/fMain.cs
View File

@@ -120,13 +120,13 @@ namespace Project
Func_Login();
if(Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
{
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
Pub.setting.SharedDataPath = FCOMMON.info.datapath;
Pub.setting.Save();
}
Update_Site();
bw.RunWorkerAsync(); //background worker
@@ -342,7 +342,7 @@ namespace Project
{
menu_projecT_list();
}
void menu_work_reportautoinput()
{
string formkey = "WORKBOOKAI";
@@ -394,7 +394,7 @@ namespace Project
AddForm(formkey, new FCM0000.fItems());
}
private void personalInventoryToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_InventoryUser();
@@ -479,7 +479,7 @@ namespace Project
var f = new FCM0000.fCustoms();
}
private void userAccountToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new _Common.fUserInfo();
@@ -730,7 +730,7 @@ namespace Project
Menu_Inventory();
}
void Menu_InventoryList()
{
string formkey = "INVENTORYLIST";
@@ -755,7 +755,7 @@ namespace Project
AddForm(formkey, new _Info.fInfo_Staff());
}
private void 임의테이블조작ToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -863,7 +863,7 @@ namespace Project
AddForm(formkey, new FCM0000.Mail.fMailList());
}
private void pMP데이터베이스업데이트ToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -988,10 +988,10 @@ namespace Project
private void accessDBToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void aLLToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "EQALL";
@@ -1022,7 +1022,7 @@ namespace Project
private void 설명서ToolStripMenuItem_Click(object sender, EventArgs e)
{
Util.RunExplorer("http://127.0.0.1:9000/Manual");
}
@@ -1060,7 +1060,7 @@ namespace Project
private void 출근부출력ToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FBS0000.WorkTable();
var f = new FBS0000.WorkTable();
f.Show();
}
@@ -1082,5 +1082,12 @@ namespace Project
var f = new FBS0000.rHolidaySummary();
f.Show();
}
private void 개인별근태원장ToolStripMenuItem_Click(object sender, EventArgs e)
{
var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
var f = new FBS0000.fHolyDayData(DateTime.Now.ToShortDateString(), uid);
f.Show();
}
}
}