190806 chi 품목정보에서 카테고리 없는 자료도 보이게 함

품목정보 정렬 기능 추가
190731  로그기록화면(beta)추가
This commit is contained in:
chikyun.kim
2019-08-06 11:38:05 +09:00
parent 11d7c7f704
commit 63dffe62ef
95 changed files with 21458 additions and 845 deletions

View File

@@ -116,12 +116,14 @@ namespace Project
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
this.menu_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
this.menu_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
this.menu_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
this.menu_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
this.menu_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.menu_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
this.mn_dailyhistory.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
this.mn_jago.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
this.mn_eq.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
this.mn_kuntae.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu);
this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
@@ -138,21 +140,41 @@ namespace Project
}
void Func_RunStartForm()
{
var menu_purchaseVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
var menu_projectVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
var menu_dailyhistoryVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_history);
var menu_jagoVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_jago);
var menu_eqVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_equipment);
var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
//시작폼 확인
if (Pub.setting.startForm == eFormList.NR구매관리)
if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible==true)
{
menu_nrpurchase();
}
else if (Pub.setting.startForm == eFormList.)
else if (Pub.setting.startForm == eFormList. && menu_dailyhistoryVisible == true)
{
menu_work_report();
}
else if (Pub.setting.startForm == eFormList.)
else if (Pub.setting.startForm == eFormList. && menu_projectVisible == true)
{
menu_projecT_list();
}
else if(Pub.setting.startForm == eFormList. && menu_jagoVisible==true)
{
Menu_Inventory();
}
else if (Pub.setting.startForm == eFormList. && menu_jagoVisible == true)
{
Menu_InventoryList();
}
else if (Pub.setting.startForm == eFormList. && menu_logdata == true)
{
Menu_logData();
}
}
void _SetLang()
{
@@ -254,9 +276,7 @@ namespace Project
private void staffGridToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "STAFFGRID";
if (!ShowForm(formkey))
AddForm(formkey, new _Info.fInfo_Staff());
}
@@ -357,9 +377,7 @@ namespace Project
private void mailFormToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "MAILFORM";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fMailform());
}
@@ -412,7 +430,7 @@ namespace Project
private void toolStripButton2_Click(object sender, EventArgs e)
{
menu_purchase.PerformClick();
mn_purchase.PerformClick();
}
private void userAccountToolStripMenuItem_Click(object sender, EventArgs e)
@@ -624,7 +642,7 @@ namespace Project
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_Inventory();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -708,5 +726,51 @@ namespace Project
f.ShowDialog();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_Inventory();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FCM0000.Inventory.RepInvStock();
f.ShowDialog();
}
void Menu_InventoryList()
{
string formkey = "INVENTORYLIST";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fInventoryJagoList());
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Menu_InventoryList();
}
private void toolStripMenuItem1_Click(object sender, EventArgs e)
{
string formkey = "STAFFGRID";
if (!ShowForm(formkey))
AddForm(formkey, new _Info.fInfo_Staff());
}
private void toolStripMenuItem3_Click(object sender, EventArgs e)
{
string formkey = "MAILFORM";
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fMailform());
}
void Menu_logData()
{
//운영기록
string formkey = "LOGDATA";
if (!ShowForm(formkey))
AddForm(formkey, new FLG0000.LogData.List());
}
private void mn_logdata_Click(object sender, EventArgs e)
{
Menu_logData();
}
}
}