From a45bf77419a7632bcdcebf6ef665ba189dad087f Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Tue, 15 Jan 2019 11:40:59 +0900 Subject: [PATCH] .. --- Project/History.txt | 3 +- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 38 +-- Project/fMain.resx | 10 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 318 ++++++++++++++------ SubProject/FPJ0000/dsPRJ.xsd | 48 ++- SubProject/FPJ0000/fProjectList.Designer.cs | 82 +++-- SubProject/FPJ0000/fProjectList.cs | 49 ++- SubProject/FPJ0000/fProjectList.resx | 2 +- 9 files changed, 385 insertions(+), 169 deletions(-) diff --git a/Project/History.txt b/Project/History.txt index 6d72390..35245bb 100644 --- a/Project/History.txt +++ b/Project/History.txt @@ -1,4 +1,5 @@ -190110 chi NR구매 화면 모델 -> 규격명칭 변경 +190115 chi 프로젝트 목록 색상 및 정렬 방식 변경 - 필터 적용 +190110 chi NR구매 화면 모델 -> 규격명칭 변경 장비기술 공정이 공용코드 09번에 연결됨 기존 장비기술 공정코드 일괄 추가(공용코드 09번) 공정,제조사,모델 항목 알파벳 정렬 diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index b18b866..cc09180 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.01.10.0900")] -[assembly: AssemblyFileVersion("19.01.10.0900")] +[assembly: AssemblyVersion("19.01.15.1100")] +[assembly: AssemblyFileVersion("19.01.15.1100")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index faa6d55..7c2877c 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -76,6 +76,7 @@ this.패치내역ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.btDev = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseImportToolStripMenuItem = 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.toolStrip = new System.Windows.Forms.ToolStrip(); @@ -87,7 +88,6 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); - this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -461,6 +461,13 @@ this.purchaseImportToolStripMenuItem.Text = "Purchase Import"; this.purchaseImportToolStripMenuItem.Click += new System.EventHandler(this.purchaseImportToolStripMenuItem_Click); // + // materialImportToolStripMenuItem + // + this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; + this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24); + this.materialImportToolStripMenuItem.Text = "Material Import"; + this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); + // // purchaseDataConvertToolStripMenuItem // this.purchaseDataConvertToolStripMenuItem.Name = "purchaseDataConvertToolStripMenuItem"; @@ -487,9 +494,10 @@ this.toolStripButton5}); this.toolStrip.Location = new System.Drawing.Point(0, 4); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(25, 146); + this.toolStrip.Size = new System.Drawing.Size(32, 165); this.toolStrip.TabIndex = 32; this.toolStrip.Text = "ToolStrip"; + this.toolTip1.SetToolTip(this.toolStrip, "NR파트 구매"); // // toolStripButton1 // @@ -497,7 +505,7 @@ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(23, 24); + this.toolStripButton1.Size = new System.Drawing.Size(30, 24); this.toolStripButton1.Text = "메일전송"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // @@ -507,7 +515,7 @@ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 24); + this.toolStripButton2.Size = new System.Drawing.Size(30, 24); this.toolStripButton2.Text = "구매신청"; this.toolStripButton2.ToolTipText = "파트구매신청서 작성"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); @@ -518,8 +526,9 @@ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(23, 24); + this.toolStripButton3.Size = new System.Drawing.Size(30, 24); this.toolStripButton3.Text = "toolStripButton3"; + this.toolStripButton3.ToolTipText = "프로젝트"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // toolStripButton4 @@ -528,8 +537,8 @@ this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(23, 24); - this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(30, 24); + this.toolStripButton4.Text = "개인 인벤토리"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // // toolStripButton5 @@ -538,7 +547,7 @@ this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(23, 24); + this.toolStripButton5.Size = new System.Drawing.Size(30, 24); this.toolStripButton5.Text = "toolStripButton5"; this.toolStripButton5.ToolTipText = "로그인/로그아웃"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); @@ -554,7 +563,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1009, 569); + this.tabControl1.Size = new System.Drawing.Size(1002, 569); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); @@ -567,7 +576,7 @@ 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(1001, 536); + this.tabPage1.Size = new System.Drawing.Size(994, 536); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "요약"; // @@ -577,7 +586,7 @@ // toolStripContainer1.ContentPanel // this.toolStripContainer1.ContentPanel.Controls.Add(this.tabControl1); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1009, 569); + this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1002, 569); this.toolStripContainer1.ContentPanel.Load += new System.EventHandler(this.toolStripContainer1_ContentPanel_Load); this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; // @@ -590,13 +599,6 @@ this.toolStripContainer1.TabIndex = 35; this.toolStripContainer1.Text = "toolStripContainer1"; // - // materialImportToolStripMenuItem - // - this.materialImportToolStripMenuItem.Name = "materialImportToolStripMenuItem"; - this.materialImportToolStripMenuItem.Size = new System.Drawing.Size(222, 24); - this.materialImportToolStripMenuItem.Text = "Material Import"; - this.materialImportToolStripMenuItem.Click += new System.EventHandler(this.materialImportToolStripMenuItem_Click); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Project/fMain.resx b/Project/fMain.resx index 10e1b01..667cb60 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -155,14 +155,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIbSURBVDhPY0iaU3o9aWbN/7Ty3ovplX3WDFAwrd5VbGad +65pVS4WcH61y64pFW4qYAUwkDS/8lLi3KqLqZW9UUkVfXcYGP4zTq10sZ9S4f52U73Pr+nl7u8nV7q5 - Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/E9vz/tXX+/3bMrHw39dzrf/3 + Tq9zerWzPubPnAaXx3NKrXih2lFBanX9n5QZRW9K6rP/zFxZ8n/X7vr/E9ry/tXX+/3bPKHw39dzrf/3 T0n9ObvW4+iq0FBmqDYEiG/s+tyydtb/WSeX/u/bP+t/89YJ/8vXtP5PX1j5P35O+f+8xdX/G1bV/q+d - W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/9Ebe/7GzKt4C9UKAUnN + W/CraGLKsbjZ5TFQrRCQ1tJ5pXb+9P+7HuzFwNvv7v6/6srG/3NPL/s/4eDc/1Ebe/7GzKt4C9UKAUnN zYvje/t/wzT17JuJlQbhOaeW/U9eUHUBqhUCklpbU9Pr6//AFMXNKcNKgzDIFfHzyldDtUJASkeHTFpV - 3//t93YTNKB+++QfcXNKW6BaEcAlqvfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j - 51X+SJhZYQrVhgBJzR2nHLta/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW + 3//t93YTNKB+++QfcXNKW6BaEcA5svfvwuPrwIrweaF4TfvH2DllqVBtCJBY3/2ua918uEJseNOt7f+j + 51X+SJhZYQrVhgBJzR2nHLpa/ib153+H4ej5FT+i51fCceKUrJ/JC2r6oVpQQVpFX0ZqZd9WKJd0kFrW q5tW3v4+parfACpEOsionXg4o7r+X2bNpP9plf0oOKNm4v/4+Im/c+qmYPcCCERX1f+Ys+7Q//T8/u9Q - ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgCJ5qFro7SHLQAAAABJRU5ErkJggg== + ITjAJwcHmUDT4+Mn/M6undwDFYIDVDkGBgB0E6FjQKK3FgAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 60fd26f..f349a48 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -451,6 +451,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnpidx; + private global::System.Data.DataColumn columnuserManager; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() { @@ -612,6 +614,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 userManagerColumn { + get { + return this.columnuserManager; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -649,7 +659,23 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsRow AddProjectsRow(string name, string pdate, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate, string status, string usermain, string usersub, int rev, int pidx) { + public ProjectsRow AddProjectsRow( + string name, + string pdate, + string request, + string reqstaff, + string sdate, + string edate, + string odate, + string memo, + string wuid, + System.DateTime wdate, + string status, + string usermain, + string usersub, + int rev, + int pidx, + string userManager) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -667,7 +693,8 @@ namespace FPJ0000 { usermain, usersub, rev, - pidx}; + pidx, + userManager}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -713,6 +740,7 @@ namespace FPJ0000 { this.columnusersub = base.Columns["usersub"]; this.columnrev = base.Columns["rev"]; this.columnpidx = base.Columns["pidx"]; + this.columnuserManager = base.Columns["userManager"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -750,6 +778,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnrev); this.columnpidx = new global::System.Data.DataColumn("pidx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpidx); + this.columnuserManager = new global::System.Data.DataColumn("userManager", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuserManager); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -772,6 +802,7 @@ namespace FPJ0000 { this.columnstatus.MaxLength = 20; this.columnusermain.MaxLength = 50; this.columnusersub.MaxLength = 50; + this.columnuserManager.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2839,6 +2870,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string userManager { + get { + if (this.IsuserManagerNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.userManagerColumn])); + } + } + set { + this[this.tableProjects.userManagerColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -2994,6 +3041,18 @@ namespace FPJ0000 { public void SetpidxNull() { this[this.tableProjects.pidxColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsuserManagerNull() { + return this.IsNull(this.tableProjects.userManagerColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetuserManagerNull() { + this[this.tableProjects.userManagerColumn] = global::System.Convert.DBNull; + } } /// @@ -4479,10 +4538,11 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("usersub", "usersub"); tableMapping.ColumnMappings.Add("rev", "rev"); tableMapping.ColumnMappings.Add("pidx", "pidx"); + tableMapping.ColumnMappings.Add("userManager", "userManager"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4513,10 +4573,12 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userManager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx); -SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager 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)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4533,28 +4595,33 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [user" + "main] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @req" + "staff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wu" + - "id] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx WHERE (([idx] = @Ori" + - "ginal_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Origin" + - "al_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original" + - "_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)" + - ") AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_" + - "usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Ori" + - "ginal_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] =" + - " @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([req" + - "staff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([" + - "sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([eda" + - "te] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate]" + - " = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Or" + - "iginal_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND " + - "((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_p" + - "idx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)));\r\nSELECT idx, status," + - " pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, w" + - "uid, wdate, rev, pidx FROM Projects WHERE (idx = @idx) ORDER BY status"; + "id] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx, [userManager] = @us" + + "erManager WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] I" + + "S NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS" + + " NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL" + + ") OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NUL" + + "L) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub]" + + " IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [req" + + "uest] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AN" + + "D [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate " + + "= 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1" + + " AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AN" + + "D [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [m" + + "emo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([" + + "wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @" + + "Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original" + + "_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManage" + + "r] = @Original_userManager)));\r\nSELECT idx, status, pdate, name, usermain, users" + + "ub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userMa" + + "nager FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN " + + "\'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([statu" + + "s] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4571,6 +4638,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4600,6 +4668,8 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_userManager", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4616,16 +4686,21 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; 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, request, reqstaff, sdate, ed" + - "ate, odate, memo, wuid, wdate, rev, pidx\r\nFROM Projects\r\nWHERE (status LIKE" + - " @state)\r\nORDER BY status"; + this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager +FROM Projects +WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR + ISNULL(usermain, '') LIKE @username OR + ISNULL(usersub, '') LIKE @username) +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)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate" + - ", status, usermain, usersub, wdate, wuid\r\nFROM Projects\r\nWHERE (idx = @idx)" + - ""; + this._commandCollection[1].CommandText = "SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate," + + " status, userManager, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = " + + "@idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4634,7 +4709,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsPRJ.ProjectsDataTable dataTable, string state) { + public virtual int Fill(dsPRJ.ProjectsDataTable dataTable, string state, string username) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((state == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4642,6 +4717,12 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(state)); } + if ((username == null)) { + throw new global::System.ArgumentNullException("username"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -4653,7 +4734,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsPRJ.ProjectsDataTable GetData(string state) { + public virtual dsPRJ.ProjectsDataTable GetData(string state, string username) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((state == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4661,6 +4742,12 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(state)); } + if ((username == null)) { + throw new global::System.ArgumentNullException("username"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(username)); + } dsPRJ.ProjectsDataTable dataTable = new dsPRJ.ProjectsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -4741,7 +4828,8 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_rev, - global::System.Nullable Original_pidx) { + global::System.Nullable Original_pidx, + string Original_userManager) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_status == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -4854,6 +4942,14 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; } + if ((Original_userManager == null)) { + this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[30].Value = ((string)(Original_userManager)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4874,7 +4970,23 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string status, string pdate, string name, string usermain, string usersub, string request, string reqstaff, string sdate, string edate, string odate, string memo, string wuid, System.DateTime wdate, global::System.Nullable rev, global::System.Nullable pidx) { + public virtual int Insert( + string status, + string pdate, + string name, + string usermain, + string usersub, + string request, + string reqstaff, + string sdate, + string edate, + string odate, + string memo, + string wuid, + System.DateTime wdate, + global::System.Nullable rev, + global::System.Nullable pidx, + string userManager) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4960,6 +5072,12 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed else { this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value; } + if ((userManager == null)) { + this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[15].Value = ((string)(userManager)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4996,6 +5114,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed System.DateTime wdate, global::System.Nullable rev, global::System.Nullable pidx, + string userManager, int Original_idx, string Original_status, string Original_pdate, @@ -5012,6 +5131,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed System.DateTime Original_wdate, global::System.Nullable Original_rev, global::System.Nullable Original_pidx, + string Original_userManager, int idx) { if ((status == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -5098,119 +5218,133 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed else { this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx)); - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + if ((userManager == null)) { + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_status)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(userManager)); + } + this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); + if ((Original_status == null)) { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_status)); } if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_pdate)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_pdate)); } if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_name)); } if ((Original_usermain == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_usermain)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_usermain)); } if ((Original_usersub == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_usersub)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_usersub)); } if ((Original_request == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_request)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_request)); } if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_reqstaff)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_reqstaff)); } if ((Original_sdate == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_sdate)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_sdate)); } if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_edate)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_edate)); } if ((Original_odate == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_odate)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_odate)); } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[40].Value = ((System.DateTime)(Original_wdate)); if ((Original_rev.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((int)(Original_rev.Value)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[42].Value = ((int)(Original_rev.Value)); } else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; } if ((Original_pidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((int)(Original_pidx.Value)); + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[44].Value = ((int)(Original_pidx.Value)); } else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[44].Value = ((int)(idx)); + if ((Original_userManager == null)) { + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_userManager)); + } + this.Adapter.UpdateCommand.Parameters[47].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -5247,6 +5381,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed System.DateTime wdate, global::System.Nullable rev, global::System.Nullable pidx, + string userManager, int Original_idx, string Original_status, string Original_pdate, @@ -5262,8 +5397,9 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed string Original_wuid, System.DateTime Original_wdate, global::System.Nullable Original_rev, - global::System.Nullable Original_pidx) { - return this.Update(status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_request, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_idx); + global::System.Nullable Original_pidx, + string Original_userManager) { + return this.Update(status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, Original_idx, Original_status, Original_pdate, Original_name, Original_usermain, Original_usersub, Original_request, Original_reqstaff, Original_sdate, Original_edate, Original_odate, Original_memo, Original_wuid, Original_wdate, Original_rev, Original_pidx, Original_userManager, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index bfa7d85..144a59d 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))) + DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager))) @@ -43,13 +43,15 @@ + + - INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx); -SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY status + INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [request], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager]) VALUES (@status, @pdate, @name, @usermain, @usersub, @request, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager 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) @@ -66,24 +68,29 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed + - SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx + SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager FROM Projects -WHERE (status LIKE @state) -ORDER BY status +WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR + ISNULL(usermain, '') LIKE @username OR + ISNULL(usersub, '') LIKE @username) +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) + - UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx))); -SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx FROM Projects WHERE (idx = @idx) ORDER BY status + UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [request] = @request, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx, [userManager] = @userManager WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_request = 1 AND [request] IS NULL) OR ([request] = @Original_request)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager))); +SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager 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) @@ -100,6 +107,7 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed + @@ -129,6 +137,8 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed + + @@ -152,14 +162,13 @@ SELECT idx, status, pdate, name, usermain, usersub, request, reqstaff, sdate, ed + - SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate, status, usermain, usersub, wdate, wuid -FROM Projects -WHERE (idx = @idx) + SELECT edate, idx, memo, name, odate, pdate, pidx, reqstaff, request, rev, sdate, status, userManager, usermain, usersub, wdate, wuid FROM Projects WHERE (idx = @idx) @@ -657,7 +666,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM - + @@ -748,10 +757,17 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM + + + + + + + - + @@ -815,7 +831,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM - + @@ -888,7 +904,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM - + @@ -922,7 +938,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM - + diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index 49ff79e..7d64cdb 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -42,6 +42,8 @@ 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.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -119,14 +121,14 @@ this.bindingNavigatorDeleteItem, this.projectsBindingNavigatorSaveItem, this.toolStripSeparator1}); - this.bn.Location = new System.Drawing.Point(0, 446); + this.bn.Location = new System.Drawing.Point(0, 451); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(736, 25); + this.bn.Size = new System.Drawing.Size(816, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -353,6 +355,7 @@ // this.tam.BackupDataSetBeforeUpdate = false; this.tam.JobReportTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; this.tam.ProjectsPartTableAdapter = null; this.tam.ProjectsScheduleTableAdapter = null; this.tam.ProjectsTableAdapter = this.ta; @@ -369,8 +372,10 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(736, 421); + this.fpSpread1.Size = new System.Drawing.Size(816, 426); + this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; + this.fpSpread1.SetViewportLeftColumn(0, 0, 5); // // fpSpread1_Sheet1 // @@ -378,19 +383,21 @@ 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 = 12; + this.fpSpread1_Sheet1.ColumnCount = 14; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Date"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Stat"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Title"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "User"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Req.Dept"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Req.Staff"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Start"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "End"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Release"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "Manager"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Req.Dept"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Req.Staff"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Start"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "End"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Release"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType1.DecimalPlaces = 0; @@ -411,6 +418,7 @@ this.fpSpread1_Sheet1.Columns.Get(2).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "Stat"; + this.fpSpread1_Sheet1.Columns.Get(2).Tag = "state"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; @@ -428,47 +436,59 @@ 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(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "User"; + 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).Label = "Manager"; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 70F; this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "request"; + 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 = "Req.Dept"; + 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 = 113F; this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "usersub"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "Req.Staff"; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "request"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Start"; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Req.Dept"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "reqstaff"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "End"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "Req.Staff"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 113F; this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "odate"; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Release"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Start"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "End"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "odate"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "Release"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -490,7 +510,7 @@ this.btSearch}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(736, 25); + this.toolStrip1.Size = new System.Drawing.Size(816, 25); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -571,7 +591,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(736, 471); + this.ClientSize = new System.Drawing.Size(816, 476); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.toolStrip1); this.Controls.Add(this.bn); @@ -639,8 +659,8 @@ private System.Windows.Forms.ToolStripButton btSearch; private System.Windows.Forms.ToolStripMenuItem scheduleToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem makeRepeatToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripMenuItem iOMapToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; + 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 21b0fc5..29dff48 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -34,10 +34,10 @@ namespace FPJ0000 //state list var stList = FCOMMON.DBM.getCodeList("01"); this.cmbState.Items.Clear(); - cmbState.Items.Add("-- All --"); + cmbState.Items.Add("-- All --"); // cmbState.Items.Add("-- incomplete --"); foreach (var item in stList) - cmbState.Items.Add(item); + cmbState.Items.Add(item.Value); this.cmbState.SelectedIndex = 0; refreshData(); @@ -48,11 +48,52 @@ namespace FPJ0000 { string state = "%"; - if (cmbState.SelectedIndex > 0) state = cmbState.Text.Split(',')[0].Substring(1); + if (cmbState.SelectedIndex > 0) state = cmbState.Text; string request = "%"; if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; - this.ta.Fill(this.dsMSSQL.Projects,"%"); + this.ta.Fill(this.dsMSSQL.Projects, state,request); + this.dsMSSQL.Projects.AcceptChanges(); + + FormattingData(); + } + + void FormattingData() + { + //삭제컬럼인덱스 + this.fpSpread1.SuspendLayout(); + var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index; + for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) + { + var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex); + string stateStr = string.Empty; + if (state != null) stateStr = state.ToString(); + + this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White; + switch (stateStr.ToLower()) + { + case "검토": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue; + break; + case "취소": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Red; + break; + case "진행": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Green; + break; + case "보류": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato; + break; + case "완료": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; + break; + default: + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black; + break; + } + + } + this.fpSpread1.ResumeLayout(); } void saveData() diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index dae9562..e80b99d 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -247,7 +247,7 @@ 248, 17 - 17, 56 + 713, 17 607, 17