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

@@ -51,22 +51,23 @@
this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menu_kuntae = new System.Windows.Forms.ToolStripMenuItem();
this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem();
this.mn_logdata = new System.Windows.Forms.ToolStripMenuItem();
this.managementToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menu_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.menu_project = new System.Windows.Forms.ToolStripMenuItem();
this.menu_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
this.menu_jago = new System.Windows.Forms.ToolStripMenuItem();
this.menu_eq = new System.Windows.Forms.ToolStripMenuItem();
this.mn_purchase = new System.Windows.Forms.ToolStripMenuItem();
this.mn_project = new System.Windows.Forms.ToolStripMenuItem();
this.mn_dailyhistory = new System.Windows.Forms.ToolStripMenuItem();
this.mn_jago = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_eq = new System.Windows.Forms.ToolStripMenuItem();
this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.boardsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_docu = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -88,6 +89,8 @@
this.addSIdDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
@@ -162,8 +165,9 @@
this.btSetting,
this.ToolStripMenuItem,
this.commonToolStripMenuItem,
this.mn_logdata,
this.managementToolStripMenuItem,
this.boardsToolStripMenuItem,
this.mn_docu,
this.ToolStripMenuItem,
this.btDev});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
@@ -196,9 +200,7 @@
this.itemsToolStripMenuItem,
this.userInfoToolStripMenuItem,
this.customerToolStripMenuItem,
this.menu_kuntae,
this.staffGridToolStripMenuItem,
this.mailFormToolStripMenuItem});
this.mn_kuntae});
this.commonToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("commonToolStripMenuItem.Image")));
this.commonToolStripMenuItem.Name = "commonToolStripMenuItem";
this.commonToolStripMenuItem.Size = new System.Drawing.Size(93, 23);
@@ -256,87 +258,96 @@
this.customerToolStripMenuItem.Text = "업체정보";
this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
//
// menu_kuntae
// mn_kuntae
//
this.menu_kuntae.Name = "menu_kuntae";
this.menu_kuntae.Size = new System.Drawing.Size(153, 24);
this.menu_kuntae.Text = "월별 근무표";
this.menu_kuntae.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_kuntae.Name = "mn_kuntae";
this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
this.mn_kuntae.Text = "월별 근무표";
this.mn_kuntae.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// staffGridToolStripMenuItem
// mn_logdata
//
this.staffGridToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem";
this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.staffGridToolStripMenuItem.Text = "Staff Grid";
this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click);
//
// mailFormToolStripMenuItem
//
this.mailFormToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem";
this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
this.mailFormToolStripMenuItem.Text = "메일 양식";
this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click);
this.mn_logdata.Image = ((System.Drawing.Image)(resources.GetObject("mn_logdata.Image")));
this.mn_logdata.Name = "mn_logdata";
this.mn_logdata.Size = new System.Drawing.Size(65, 23);
this.mn_logdata.Text = "기록";
this.mn_logdata.Click += new System.EventHandler(this.mn_logdata_Click);
//
// managementToolStripMenuItem
//
this.managementToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menu_purchase,
this.menu_project,
this.menu_dailyhistory,
this.menu_jago,
this.menu_eq,
this.mn_purchase,
this.mn_project,
this.mn_dailyhistory,
this.mn_jago,
this.mn_eq,
this.personalInventoryToolStripMenuItem});
this.managementToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("managementToolStripMenuItem.Image")));
this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.managementToolStripMenuItem.Text = "관리";
//
// menu_purchase
// mn_purchase
//
this.menu_purchase.Image = ((System.Drawing.Image)(resources.GetObject("menu_purchase.Image")));
this.menu_purchase.Name = "menu_purchase";
this.menu_purchase.Size = new System.Drawing.Size(153, 24);
this.menu_purchase.Text = "구매신청";
this.menu_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
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(153, 24);
this.mn_purchase.Text = "구매신청";
this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click);
//
// menu_project
// mn_project
//
this.menu_project.Image = ((System.Drawing.Image)(resources.GetObject("menu_project.Image")));
this.menu_project.Name = "menu_project";
this.menu_project.Size = new System.Drawing.Size(153, 24);
this.menu_project.Text = "프로젝트";
this.menu_project.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image")));
this.mn_project.Name = "mn_project";
this.mn_project.Size = new System.Drawing.Size(153, 24);
this.mn_project.Text = "프로젝트";
this.mn_project.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// menu_dailyhistory
// mn_dailyhistory
//
this.menu_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("menu_dailyhistory.Image")));
this.menu_dailyhistory.Name = "menu_dailyhistory";
this.menu_dailyhistory.Size = new System.Drawing.Size(153, 24);
this.menu_dailyhistory.Text = "업무일지";
this.menu_dailyhistory.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image")));
this.mn_dailyhistory.Name = "mn_dailyhistory";
this.mn_dailyhistory.Size = new System.Drawing.Size(153, 24);
this.mn_dailyhistory.Text = "업무일지";
this.mn_dailyhistory.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// menu_jago
// mn_jago
//
this.menu_jago.Image = ((System.Drawing.Image)(resources.GetObject("menu_jago.Image")));
this.menu_jago.Name = "menu_jago";
this.menu_jago.Size = new System.Drawing.Size(153, 24);
this.menu_jago.Text = "품목재고";
this.menu_jago.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image")));
this.mn_jago.Name = "mn_jago";
this.mn_jago.Size = new System.Drawing.Size(153, 24);
this.mn_jago.Text = "품목재고";
this.mn_jago.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// menu_eq
// 관리ToolStripMenuItem
//
this.menu_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem.Name = "관리ToolStripMenuItem";
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(134, 24);
this.ToolStripMenuItem.Text = "재고현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// mn_eq
//
this.mn_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dataFOLToolStripMenuItem,
this.dataMoldEOLToolStripMenuItem,
this.dataToolStripMenuItem,
this.toolStripMenuItem2,
this.ToolStripMenuItem});
this.menu_eq.Image = ((System.Drawing.Image)(resources.GetObject("menu_eq.Image")));
this.menu_eq.Name = "menu_eq";
this.menu_eq.Size = new System.Drawing.Size(153, 24);
this.menu_eq.Text = "장비 목록";
this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
this.mn_eq.Name = "mn_eq";
this.mn_eq.Size = new System.Drawing.Size(153, 24);
this.mn_eq.Text = "장비 목록";
//
// dataFOLToolStripMenuItem
//
@@ -380,9 +391,9 @@
this.personalInventoryToolStripMenuItem.Visible = false;
this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click);
//
// boardsToolStripMenuItem
// mn_docu
//
this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mn_docu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem1,
this.minutesToolStripMenuItem,
this.holidayToolStripMenuItem,
@@ -391,10 +402,10 @@
this.bugReportToolStripMenuItem,
this.todoListToolStripMenuItem,
this.ToolStripMenuItem});
this.boardsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("boardsToolStripMenuItem.Image")));
this.boardsToolStripMenuItem.Name = "boardsToolStripMenuItem";
this.boardsToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.boardsToolStripMenuItem.Text = "문서";
this.mn_docu.Image = ((System.Drawing.Image)(resources.GetObject("mn_docu.Image")));
this.mn_docu.Name = "mn_docu";
this.mn_docu.Size = new System.Drawing.Size(65, 23);
this.mn_docu.Text = "문서";
//
// 패치내역ToolStripMenuItem1
//
@@ -477,7 +488,9 @@
this.workReportImportToolStripMenuItem,
this.addSIdDataToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem1});
this.ToolStripMenuItem1,
this.toolStripMenuItem1,
this.toolStripMenuItem3});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(91, 23);
@@ -561,6 +574,22 @@
this.ToolStripMenuItem1.Text = "그룹정보";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem1.Text = "Staff Grid";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.ForeColor = System.Drawing.Color.HotPink;
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(235, 24);
this.toolStripMenuItem3.Text = "메일 양식";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -619,13 +648,12 @@
private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel sbLogin;
private System.Windows.Forms.ToolStripMenuItem codesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem boardsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_docu;
private System.Windows.Forms.ToolStripMenuItem freeBoardToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bugReportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem todoListToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem managementToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_eq;
private System.Windows.Forms.ToolStripMenuItem staffGridToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mn_eq;
private System.Windows.Forms.ToolStripMenuItem dataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataFOLToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dataMoldEOLToolStripMenuItem;
@@ -633,9 +661,8 @@
private System.Windows.Forms.ToolStripMenuItem userInfoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem minutesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem holidayToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mailFormToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem requestITemToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_purchase;
private System.Windows.Forms.ToolStripMenuItem mn_purchase;
private System.Windows.Forms.ToolStripMenuItem btDev;
private System.Windows.Forms.ToolStripMenuItem purchaseImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem;
@@ -649,21 +676,26 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem projectImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_project;
private System.Windows.Forms.ToolStripMenuItem mn_project;
private System.Windows.Forms.ToolStripMenuItem projectImportCompleteToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem purchaseOrderImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_dailyhistory;
private System.Windows.Forms.ToolStripMenuItem mn_dailyhistory;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem workReportImportToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_kuntae;
private System.Windows.Forms.ToolStripMenuItem mn_kuntae;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem menu_jago;
private System.Windows.Forms.ToolStripMenuItem mn_jago;
private System.Windows.Forms.ToolStripMenuItem addSIdDataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem mn_logdata;
}
}