diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3f4bb1b..783d8f1 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.05.09.1000")] -[assembly: AssemblyFileVersion("19.05.09.1000")] +[assembly: AssemblyVersion("19.05.17.0900")] +[assembly: AssemblyFileVersion("19.05.17.0900")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index bac62f2..1eddaf2 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -28,11 +28,12 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMain)); - this.tmDisplay = new System.Windows.Forms.Timer(); - this.toolTip1 = new System.Windows.Forms.ToolTip(); + this.tmDisplay = new System.Windows.Forms.Timer(this.components); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.bw = new System.ComponentModel.BackgroundWorker(); - this.cmTab = new System.Windows.Forms.ContextMenuStrip(); + this.cmTab = new System.Windows.Forms.ContextMenuStrip(this.components); this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sbBWRun = new System.Windows.Forms.ToolStripStatusLabel(); this.sbBCD = new System.Windows.Forms.ToolStripStatusLabel(); @@ -41,17 +42,6 @@ this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); this.btLog = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.btDev = 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(); - this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.projectImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.projectImportCompleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.workReportImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.commonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -87,6 +77,18 @@ this.bugReportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.todoListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.btDev = 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(); + this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.customerImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projectImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projectImportCompleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.workReportImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.즐겨찾기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -173,6 +175,7 @@ this.commonToolStripMenuItem, this.managementToolStripMenuItem, this.boardsToolStripMenuItem, + this.즐겨찾기ToolStripMenuItem, this.btDev}); this.menuStrip1.Location = new System.Drawing.Point(1, 1); this.menuStrip1.Name = "menuStrip1"; @@ -180,107 +183,6 @@ this.menuStrip1.TabIndex = 29; this.menuStrip1.Text = "menuStrip1"; // - // btDev - // - this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.purchaseImportToolStripMenuItem, - this.purchaseOrderImportToolStripMenuItem, - this.materialImportToolStripMenuItem, - this.purchaseDataConvertToolStripMenuItem, - this.customerImportToolStripMenuItem, - this.projectImportToolStripMenuItem, - this.projectImportCompleteToolStripMenuItem, - this.workReportImportToolStripMenuItem}); - this.btDev.ForeColor = System.Drawing.Color.Blue; - this.btDev.Name = "btDev"; - this.btDev.Size = new System.Drawing.Size(91, 23); - this.btDev.Text = "개발자메뉴"; - this.btDev.Visible = false; - // - // purchaseImportToolStripMenuItem - // - this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem"; - this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.purchaseImportToolStripMenuItem.Text = "Purchase Import"; - this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click); - // - // purchaseOrderImportToolStripMenuItem - // - this.purchaseOrderImportToolStripMenuItem.Name = "purchaseOrderImportToolStripMenuItem"; - this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.purchaseOrderImportToolStripMenuItem.Text = "Purchase(Order) Import"; - this.purchaseOrderImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseOrderImportToolStripMenuItem_Click); - // - // materialImportToolStripMenuItem - // - this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; - this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.materialImportToolStripMenuItem.Text = "Material Import"; - this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); - // - // purchaseDataConvertToolStripMenuItem - // - this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem"; - this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert"; - this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click); - // - // customerImportToolStripMenuItem - // - this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem"; - this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.customerImportToolStripMenuItem.Text = "Customer Import"; - this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click); - // - // projectImportToolStripMenuItem - // - this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem"; - this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.projectImportToolStripMenuItem.Text = "Project Import"; - this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click); - // - // projectImportCompleteToolStripMenuItem - // - this.projectImportCompleteToolStripMenuItem.Name = "projectImportCompleteToolStripMenuItem"; - this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.projectImportCompleteToolStripMenuItem.Text = "Project Import(Complete)"; - this.projectImportCompleteToolStripMenuItem.Click += new System.EventHandler(this.projectImportCompleteToolStripMenuItem_Click); - // - // workReportImportToolStripMenuItem - // - this.workReportImportToolStripMenuItem.Name = "workReportImportToolStripMenuItem"; - this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); - this.workReportImportToolStripMenuItem.Text = "WorkReport Import"; - this.workReportImportToolStripMenuItem.Click += new System.EventHandler(this.workReportImportToolStripMenuItem_Click); - // - // tabControl1 - // - this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tabControl1.Location = new System.Drawing.Point(1, 28); - this.tabControl1.Multiline = true; - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1034, 594); - this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; - this.tabControl1.TabIndex = 34; - this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); - // - // tabPage1 - // - this.tabPage1.BackColor = System.Drawing.Color.LightGray; - this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.tabPage1.ContextMenuStrip = this.cmTab; - this.tabPage1.Location = new System.Drawing.Point(4, 29); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(10); - this.tabPage1.Size = new System.Drawing.Size(1026, 561); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "요약"; - // // btSetting // this.btSetting.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -569,6 +471,114 @@ this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); // + // btDev + // + this.btDev.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.purchaseImportToolStripMenuItem, + this.purchaseOrderImportToolStripMenuItem, + this.materialImportToolStripMenuItem, + this.purchaseDataConvertToolStripMenuItem, + this.customerImportToolStripMenuItem, + this.projectImportToolStripMenuItem, + this.projectImportCompleteToolStripMenuItem, + this.workReportImportToolStripMenuItem}); + this.btDev.ForeColor = System.Drawing.Color.Blue; + this.btDev.Name = "btDev"; + this.btDev.Size = new System.Drawing.Size(91, 23); + this.btDev.Text = "개발자메뉴"; + this.btDev.Visible = false; + // + // purchaseImportToolStripMenuItem + // + this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem"; + this.purchaseImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.purchaseImportToolStripMenuItem.Text = "Purchase Import"; + this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click); + // + // purchaseOrderImportToolStripMenuItem + // + this.purchaseOrderImportToolStripMenuItem.Name = "purchaseOrderImportToolStripMenuItem"; + this.purchaseOrderImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.purchaseOrderImportToolStripMenuItem.Text = "Purchase(Order) Import"; + this.purchaseOrderImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseOrderImportToolStripMenuItem_Click); + // + // materialImportToolStripMenuItem + // + this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; + this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.materialImportToolStripMenuItem.Text = "Material Import"; + this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); + // + // purchaseDataConvertToolStripMenuItem + // + this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem"; + this.purchaseDataConvertToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.purchaseDataConvertToolStripMenuItem.Text = "Purchase Data Convert"; + this.purchaseDataConvertToolStripMenuItem.Click += new System.EventHandler(this.purchaseDataConvertToolStripMenuItem_Click); + // + // customerImportToolStripMenuItem + // + this.customerImportToolStripMenuItem.Name = "customerImportToolStripMenuItem"; + this.customerImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.customerImportToolStripMenuItem.Text = "Customer Import"; + this.customerImportToolStripMenuItem.Click += new System.EventHandler(this.customerImportToolStripMenuItem_Click); + // + // projectImportToolStripMenuItem + // + this.projectImportToolStripMenuItem.Name = "projectImportToolStripMenuItem"; + this.projectImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.projectImportToolStripMenuItem.Text = "Project Import"; + this.projectImportToolStripMenuItem.Click += new System.EventHandler(this.projectImportToolStripMenuItem_Click); + // + // projectImportCompleteToolStripMenuItem + // + this.projectImportCompleteToolStripMenuItem.Name = "projectImportCompleteToolStripMenuItem"; + this.projectImportCompleteToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.projectImportCompleteToolStripMenuItem.Text = "Project Import(Complete)"; + this.projectImportCompleteToolStripMenuItem.Click += new System.EventHandler(this.projectImportCompleteToolStripMenuItem_Click); + // + // workReportImportToolStripMenuItem + // + this.workReportImportToolStripMenuItem.Name = "workReportImportToolStripMenuItem"; + this.workReportImportToolStripMenuItem.Size = new System.Drawing.Size(235, 24); + this.workReportImportToolStripMenuItem.Text = "WorkReport Import"; + this.workReportImportToolStripMenuItem.Click += new System.EventHandler(this.workReportImportToolStripMenuItem_Click); + // + // tabControl1 + // + this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tabControl1.Location = new System.Drawing.Point(1, 28); + this.tabControl1.Multiline = true; + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.ShowToolTips = true; + this.tabControl1.Size = new System.Drawing.Size(1034, 594); + this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; + this.tabControl1.TabIndex = 34; + this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); + // + // tabPage1 + // + this.tabPage1.BackColor = System.Drawing.Color.LightGray; + this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.tabPage1.ContextMenuStrip = this.cmTab; + this.tabPage1.Location = new System.Drawing.Point(4, 29); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(10); + this.tabPage1.Size = new System.Drawing.Size(1026, 561); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "요약"; + // + // 즐겨찾기ToolStripMenuItem + // + this.즐겨찾기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("즐겨찾기ToolStripMenuItem.Image"))); + this.즐겨찾기ToolStripMenuItem.Name = "즐겨찾기ToolStripMenuItem"; + this.즐겨찾기ToolStripMenuItem.Size = new System.Drawing.Size(93, 23); + this.즐겨찾기ToolStripMenuItem.Text = "즐겨찾기"; + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -657,6 +667,7 @@ private System.Windows.Forms.ToolStripMenuItem 패치내역ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem workReportImportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 월별근무표ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 즐겨찾기ToolStripMenuItem; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index 007e9ec..7df1753 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -84,10 +84,31 @@ namespace Project tmDisplay.Start(); //display timer Func_Login(); - + Update_Site(); bw.RunWorkerAsync(); //background worker } + void Update_Site() + { + //즐겨찾기 없데이트 g=17 + //타입 + var dt_type = FCOMMON.DBM.getCodeTable("17"); + foreach(DataRow dr in dt_type.Rows) + { + var bt = new ToolStripMenuItem(); + bt.Text = dr["value"].ToString(); + bt.Tag = dr["svalue"].ToString(); + bt.Click += bt_Click; + 즐겨찾기ToolStripMenuItem.DropDownItems.Add(bt); + } + } + + void bt_Click(object sender, EventArgs e) + { + var bt = sender as ToolStripMenuItem; + var cmd = bt.Tag.ToString(); + Util.RunExplorer(cmd); + } void Func_Login() { diff --git a/Project/fMain.resx b/Project/fMain.resx index bb94a2a..aa422f2 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -162,6 +162,34 @@ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== @@ -214,25 +242,6 @@ AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL hQnTql2rNiAAOw== - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= diff --git a/SubProject/FPJ0000/JobReport/rJobReportDay.rdlc b/SubProject/FPJ0000/JobReport/rJobReportDay.rdlc index 66a1483..de1ea04 100644 --- a/SubProject/FPJ0000/JobReport/rJobReportDay.rdlc +++ b/SubProject/FPJ0000/JobReport/rJobReportDay.rdlc @@ -72,6 +72,7 @@ @@ -93,6 +94,7 @@ 2pt + true diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 15d6156..3ebf31f 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -567,6 +567,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnorderno; + private global::System.Data.DataColumn columnlasthistory; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() : @@ -873,6 +875,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn lasthistoryColumn { + get { + return this.columnlasthistory; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -942,7 +952,8 @@ namespace FPJ0000 { bool isdel, string path, string userhw2, - string orderno) { + string orderno, + string lasthistory) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -977,7 +988,8 @@ namespace FPJ0000 { isdel, path, userhw2, - orderno}; + orderno, + lasthistory}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1016,7 +1028,8 @@ namespace FPJ0000 { bool isdel, string path, string userhw2, - string orderno) { + string orderno, + string lasthistory) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1051,7 +1064,8 @@ namespace FPJ0000 { isdel, path, userhw2, - orderno}; + orderno, + lasthistory}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1114,6 +1128,7 @@ namespace FPJ0000 { this.columnpath = base.Columns["path"]; this.columnuserhw2 = base.Columns["userhw2"]; this.columnorderno = base.Columns["orderno"]; + this.columnlasthistory = base.Columns["lasthistory"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1185,6 +1200,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnuserhw2); this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnorderno); + this.columnlasthistory = new global::System.Data.DataColumn("lasthistory", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnlasthistory); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1217,6 +1234,8 @@ namespace FPJ0000 { this.columnpath.MaxLength = 300; this.columnuserhw2.MaxLength = 50; this.columnorderno.MaxLength = 50; + this.columnlasthistory.ReadOnly = true; + this.columnlasthistory.MaxLength = 200; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4433,6 +4452,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string lasthistory { + get { + if (this.IslasthistoryNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.lasthistoryColumn])); + } + } + set { + this[this.tableProjects.lasthistoryColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -4792,6 +4827,18 @@ namespace FPJ0000 { public void SetordernoNull() { this[this.tableProjects.ordernoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IslasthistoryNull() { + return this.IsNull(this.tableProjects.lasthistoryColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetlasthistoryNull() { + this[this.tableProjects.lasthistoryColumn] = global::System.Convert.DBNull; + } } /// @@ -6944,6 +6991,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("path", "path"); tableMapping.ColumnMappings.Add("userhw2", "userhw2"); tableMapping.ColumnMappings.Add("orderno", "orderno"); + tableMapping.ColumnMappings.Add("lasthistory", "lasthistory"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -7139,7 +7187,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -7156,7 +7204,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -7164,7 +7212,7 @@ WHERE (idx = @idx)"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0)"; diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index f0c5301..d14dae0 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -21,51 +21,51 @@ WHERE (idx = @Original_idx) - + INSERT INTO Projects (status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno) VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -79,7 +79,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN - + UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, @@ -114,93 +114,93 @@ WHERE (idx = @Original_idx) AND (@IsNull_status = 1 AND status IS NULL OR userhw2 = @Original_userhw2); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -239,6 +239,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -253,7 +254,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, - userManager, userhw2, usermain, usersub, wdate, wuid + userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (idx = @idx) @@ -266,7 +267,7 @@ WHERE (idx = @idx) SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, - progress, import, asset, isdel, path, userhw2, orderno + progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) @@ -1022,7 +1023,7 @@ WHERE (pidx = @pidx) - + @@ -1184,10 +1185,17 @@ WHERE (pidx = @pidx) + + + + + + + - + @@ -1231,7 +1239,7 @@ WHERE (pidx = @pidx) - + @@ -1276,7 +1284,7 @@ WHERE (pidx = @pidx) - + @@ -1340,7 +1348,7 @@ WHERE (pidx = @pidx) - + @@ -1444,7 +1452,7 @@ WHERE (pidx = @pidx) - + @@ -1478,7 +1486,7 @@ WHERE (pidx = @pidx) - + diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index c3368f0..44c4a20 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -30,23 +30,24 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -60,8 +61,9 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btAdd = new System.Windows.Forms.ToolStripButton(); - this.btDel = new System.Windows.Forms.ToolStripButton(); + this.btCopy = new System.Windows.Forms.ToolStripButton(); this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.btDel = new System.Windows.Forms.ToolStripButton(); this.btSave = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -81,12 +83,13 @@ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.메일발송주소관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -135,22 +138,20 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); - this.btCopy = new System.Windows.Forms.ToolStripButton(); - this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsHist)).BeginInit(); this.tableLayoutPanel2.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -277,14 +278,14 @@ this.btAdd.Text = "추가(&A)"; this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // - // btDel + // btCopy // - this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); - this.btDel.Name = "btDel"; - this.btDel.RightToLeftAutoMirrorImage = true; - this.btDel.Size = new System.Drawing.Size(68, 22); - this.btDel.Text = "삭제(&D)"; - this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + this.btCopy.Image = global::FPJ0000.Properties.Resources.copy; + this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btCopy.Name = "btCopy"; + this.btCopy.Size = new System.Drawing.Size(67, 22); + this.btCopy.Text = "복사(&C)"; + this.btCopy.Click += new System.EventHandler(this.btCopy_Click); // // btEdit // @@ -294,6 +295,15 @@ this.btEdit.Text = "편집(&E)"; this.btEdit.Click += new System.EventHandler(this.btEdit_Click); // + // btDel + // + this.btDel.Image = ((System.Drawing.Image)(resources.GetObject("btDel.Image"))); + this.btDel.Name = "btDel"; + this.btDel.RightToLeftAutoMirrorImage = true; + this.btDel.Size = new System.Drawing.Size(68, 22); + this.btDel.Text = "삭제(&D)"; + this.btDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); + // // btSave // this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image"))); @@ -446,6 +456,18 @@ this.makeRepeatToolStripMenuItem.Text = "복사"; this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); // + // 편집ToolStripMenuItem1 + // + this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); + this.편집ToolStripMenuItem1.Text = "편집"; + // + // 삭제ToolStripMenuItem + // + this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); + this.삭제ToolStripMenuItem.Text = "삭제"; + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; @@ -490,164 +512,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1084, 262); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 17; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Status"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Part"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Process"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Requestor"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Project\r\nChampion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Co Workers"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Project"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Remark"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType11.DecimalPlaces = 0; - numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType11.MaximumValue = 2147483647D; - numberCellType11.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType25; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType26; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType27; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType28; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType29; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType30; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType31; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType32; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType33; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType34; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - numberCellType12.DecimalPlaces = 0; - numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType12.MaximumValue = 2147483647D; - numberCellType12.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType12; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F; - numberCellType13.MaximumValue = 999999999999999D; - numberCellType13.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType13; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType14.MaximumValue = 999999999999999D; - numberCellType14.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType14; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType15.MaximumValue = 999999999999999D; - numberCellType15.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType15; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType35; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType36; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "memo"; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + this.fpSpread1.SetViewportLeftColumn(0, 0, 3); // // toolStrip1 // @@ -1181,26 +1046,169 @@ this.panel3.Size = new System.Drawing.Size(1084, 218); this.panel3.TabIndex = 7; // - // btCopy + // fpSpread1_Sheet1 // - this.btCopy.Image = global::FPJ0000.Properties.Resources.copy; - this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btCopy.Name = "btCopy"; - this.btCopy.Size = new System.Drawing.Size(67, 22); - this.btCopy.Text = "복사(&C)"; - this.btCopy.Click += new System.EventHandler(this.btCopy_Click); - // - // 편집ToolStripMenuItem1 - // - this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(304, 36); - this.편집ToolStripMenuItem1.Text = "편집"; - // - // 삭제ToolStripMenuItem - // - this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(304, 36); - this.삭제ToolStripMenuItem.Text = "삭제"; + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 18; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Status"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Part"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Process"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Requestor"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Project\r\nChampion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Co Workers"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Project"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "History"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Remark"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userhw2"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "전장"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 59F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(14).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "lasthistory"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "memo"; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fProjectList // @@ -1222,7 +1230,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1231,6 +1238,7 @@ ((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit(); this.tableLayoutPanel2.ResumeLayout(false); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1325,9 +1333,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripLabel toolStripLabel5; private System.Windows.Forms.ToolStripComboBox cmbSort; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index 430094b..f96b735 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -132,7 +132,7 @@ namespace FPJ0000 // var orgQuery = this.ta.Adapter.SelectCommand.CommandText; - string State_Select = " SELECT * FROM Projects"; + string State_Select = " SELECT *, dbo.getLastHistory(idx) AS lasthistory FROM Projects"; string State_where = " WHERE "; if (btViewDel.Checked==false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index 1d51c48..f6c6d67 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -208,9 +208,6 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - 387, 17 @@ -397,16 +394,10 @@ 561, 17 - - 561, 17 - 883, 17 647, 17 - - 883, 17 - \ No newline at end of file