From 4334725900a083b35d081d9a3a421b93f45cbcb5 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 13 Dec 2023 09:33:18 +0900 Subject: [PATCH] .. --- Project/Properties/AssemblyInfo.cs | 4 +- .../FPJ0000/Project/fProjectList.Designer.cs | 124 ++++----- .../fProjectPartToPurchaseCR.Designer.cs | 12 +- .../Project/fProjectPartToPurchaseCR.cs | 1 + SubProject/FPJ0000/dsPRJ.Designer.cs | 66 +++-- SubProject/FPJ0000/dsPRJ.xsd | 246 ++++++++++-------- SubProject/FPJ0000/dsPurchase.Designer.cs | 4 +- SubProject/FPJ0000/dsPurchase.xsd | 190 +++++++------- 8 files changed, 354 insertions(+), 293 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 55b33a8..ae9900c 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("23.12.08.1640")] -[assembly: AssemblyFileVersion("23.12.08.1640")] +[assembly: AssemblyVersion("23.12.13.0930")] +[assembly: AssemblyFileVersion("23.12.13.0930")] diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 0df95bd..8b320b4 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -181,6 +181,10 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.prb1 = new arCtl.arLabel(); + this.label32 = new System.Windows.Forms.Label(); + this.label33 = new System.Windows.Forms.Label(); + this.label34 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); this.toolStrip2 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel8 = new System.Windows.Forms.ToolStripLabel(); @@ -204,10 +208,6 @@ this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.label32 = new System.Windows.Forms.Label(); - this.label33 = new System.Windows.Forms.Label(); - this.label34 = new System.Windows.Forms.Label(); - this.label35 = new System.Windows.Forms.Label(); this.lbcnt1 = new System.Windows.Forms.Label(); this.lbcnt2 = new System.Windows.Forms.Label(); this.lbcnt3 = new System.Windows.Forms.Label(); @@ -1787,6 +1787,64 @@ this.prb1.TextVisible = true; this.toolTip1.SetToolTip(this.prb1, "구매대상 중 구매완료 율"); // + // label32 + // + this.label32.BackColor = System.Drawing.Color.Gainsboro; + this.label32.Dock = System.Windows.Forms.DockStyle.Fill; + this.label32.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label32.Location = new System.Drawing.Point(1, 1); + this.label32.Margin = new System.Windows.Forms.Padding(0); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(80, 27); + this.label32.TabIndex = 0; + this.label32.Text = "검토"; + this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label32, "시작일"); + // + // label33 + // + this.label33.BackColor = System.Drawing.Color.Gainsboro; + this.label33.Dock = System.Windows.Forms.DockStyle.Fill; + this.label33.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label33.Location = new System.Drawing.Point(670, 1); + this.label33.Margin = new System.Windows.Forms.Padding(0); + this.label33.Name = "label33"; + this.label33.Size = new System.Drawing.Size(80, 27); + this.label33.TabIndex = 0; + this.label33.Text = "취소"; + this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label33, "완료일"); + // + // label34 + // + this.label34.BackColor = System.Drawing.Color.Gainsboro; + this.label34.Dock = System.Windows.Forms.DockStyle.Fill; + this.label34.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.label34.Location = new System.Drawing.Point(224, 1); + this.label34.Margin = new System.Windows.Forms.Padding(0); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(80, 27); + this.label34.TabIndex = 0; + this.label34.Text = "진행"; + this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label34, "예상완료일"); + // + // label35 + // + this.label35.BackColor = System.Drawing.Color.Gainsboro; + this.label35.Dock = System.Windows.Forms.DockStyle.Fill; + this.label35.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.label35.Location = new System.Drawing.Point(447, 1); + this.label35.Margin = new System.Windows.Forms.Padding(0); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(80, 27); + this.label35.TabIndex = 0; + this.label35.Text = "보류"; + this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label35, "출고일(프로그램의 경우 설치일)"); + // // panel3 // this.panel3.Controls.Add(this.tableLayoutPanel1); @@ -2071,64 +2129,6 @@ this.tableLayoutPanel4.Size = new System.Drawing.Size(1339, 29); this.tableLayoutPanel4.TabIndex = 35; // - // label32 - // - this.label32.BackColor = System.Drawing.Color.Gainsboro; - this.label32.Dock = System.Windows.Forms.DockStyle.Fill; - this.label32.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label32.Location = new System.Drawing.Point(1, 1); - this.label32.Margin = new System.Windows.Forms.Padding(0); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(80, 27); - this.label32.TabIndex = 0; - this.label32.Text = "검토"; - this.label32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label32, "시작일"); - // - // label33 - // - this.label33.BackColor = System.Drawing.Color.Gainsboro; - this.label33.Dock = System.Windows.Forms.DockStyle.Fill; - this.label33.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label33.Location = new System.Drawing.Point(670, 1); - this.label33.Margin = new System.Windows.Forms.Padding(0); - this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(80, 27); - this.label33.TabIndex = 0; - this.label33.Text = "취소"; - this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label33, "완료일"); - // - // label34 - // - this.label34.BackColor = System.Drawing.Color.Gainsboro; - this.label34.Dock = System.Windows.Forms.DockStyle.Fill; - this.label34.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label34.Location = new System.Drawing.Point(224, 1); - this.label34.Margin = new System.Windows.Forms.Padding(0); - this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(80, 27); - this.label34.TabIndex = 0; - this.label34.Text = "진행"; - this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label34, "예상완료일"); - // - // label35 - // - this.label35.BackColor = System.Drawing.Color.Gainsboro; - this.label35.Dock = System.Windows.Forms.DockStyle.Fill; - this.label35.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label35.Location = new System.Drawing.Point(447, 1); - this.label35.Margin = new System.Windows.Forms.Padding(0); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(80, 27); - this.label35.TabIndex = 0; - this.label35.Text = "보류"; - this.label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.toolTip1.SetToolTip(this.label35, "출고일(프로그램의 경우 설치일)"); - // // lbcnt1 // this.lbcnt1.Dock = System.Windows.Forms.DockStyle.Fill; diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs index 8e7f6f4..75fa130 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs @@ -408,8 +408,8 @@ 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(99, 44); - this.toolStripButton2.Text = "선택삭제"; + this.toolStripButton2.Size = new System.Drawing.Size(116, 44); + this.toolStripButton2.Text = "선택삭제(&D)"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripButton4 @@ -418,8 +418,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(137, 44); - this.toolStripButton4.Text = "CR구매 등록 (&S)"; + this.toolStripButton4.Size = new System.Drawing.Size(133, 44); + this.toolStripButton4.Text = "CR구매 등록(&S)"; this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // // toolStripButton8 @@ -427,8 +427,8 @@ this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(115, 44); - this.toolStripButton8.Text = "목록 재구성"; + this.toolStripButton8.Size = new System.Drawing.Size(130, 44); + this.toolStripButton8.Text = "목록 재구성(&R)"; this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); // // panel1 diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs index ecf759d..2bdb547 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs @@ -108,6 +108,7 @@ namespace FPJ0000 private void __Load(object sender, EventArgs e) { //프로젝트정보를 찾는다. + toolStripButton2.Text = "선택삭제(&D)"; var dtPrj = taProject.GetbyIDX(this.ProjectIndex); var drPrj = dtPrj.Rows[0] as dsPRJ.ProjectsRow; this.tbProjectIndex.Text = drPrj.idx.ToString(); diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 0ac6f8b..362c770 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -24901,13 +24901,13 @@ namespace FPJ0000.dsPRJTableAdapters { "yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n " + " (SELECT MAX(pdate) AS Expr1\r\n FROM Projects" + "History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " + - "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount\r\nFROM Projects\r\nW" + - "HERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n " + - " ISNULL(usermain, \'\') LIKE @username OR\r\n ISNULL(usersub," + - " \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nORDER BY (" + - "CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status" + - "] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n " + - " THEN \'9\' ELSE \'5\' END)"; + "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount\r\nFROM Projects WI" + + "TH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @user" + + "name OR\r\n ISNULL(usermain, \'\') LIKE @username OR\r\n I" + + "SNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcod" + + "e)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\'" + + " WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] " + + "= \'취소\') \r\n 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, 50, 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, "", "", "")); @@ -24919,12 +24919,42 @@ namespace FPJ0000.dsPRJTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (idx = @idx)"; + this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) + AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws +FROM Projects WITH (nolock) +WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].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, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)"; + this._commandCollection[3].CommandText = "SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getSchedulePr" + + "ogressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid," + + " asset, bCost, bFanOut, \r\n bHighlight, bdate, category, cdate, cha" + + "mpionid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangibl" + + "e, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) \r\n " + + " AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(" + + "idx) AS lasthistory,\r\n (SELECT MAX(pdate) AS Expr1\r\n " + + " FROM ProjectsHistory\r\n WHERE (pidx = Projects" + + ".idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid" + + ") AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n " + + " dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_e" + + "panel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path," + + " pdate, pidx, pno, \r\n process, progress, qdate, remark_ans, remark" + + "_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftc" + + "ount, sfi_type, softwareid, status, userAssembly, userManager, \r\n " + + "userhw2, usermain, userprocess, usersub, wdate, wuid, \'\' AS wwd, \'\' AS wwe, \'\' A" + + "S wwo, \'\' AS wws\r\nFROM Projects WITH (nolock)\r\nWHERE (ISNULL(name, N\'\') LIK" + + "E @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR\r\n (I" + + "SNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search" + + ") OR\r\n (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(mem" + + "o, N\'\') LIKE @search)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -26376,7 +26406,7 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark\r\nFROM Projec" + - "tsIOMap\r\nWHERE (Project = @Project)\r\nORDER BY Dir, PIn"; + "tsIOMap WITH (nolock)\r\nWHERE (Project = @Project)\r\nORDER BY Dir, PIn"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "Project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -27676,7 +27706,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyn, amtn -FROM ProjectsPart +FROM ProjectsPart WITH (nolock) WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; @@ -31379,7 +31409,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi -FROM EETGW_SaveCost +FROM EETGW_SaveCost WITH (nolock) ORDER BY pdate"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -32786,14 +32816,18 @@ WHERE (idx = @idx)"; this._commandCollection[0].CommandText = @"SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, recvUser, reqUser, bCancel, recvDate -FROM vProjectPartPurchase +FROM vProjectPartPurchase WITH (nolock) WHERE (gcode = @gcode) ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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 Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, userManager, wdate, wuid FROM vProjectPartPurchase WHERE (gcode = @gcode) AND (idx = @idx)"; + this._commandCollection[1].CommandText = @"SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, + no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) + AS userGroupName, userManager, wdate, wuid +FROM vProjectPartPurchase WITH (nolock) +WHERE (gcode = @gcode) AND (idx = @idx)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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, "", "", "")); @@ -33172,7 +33206,7 @@ SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate FROM EETGW_ this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate\r\nFROM E" + - "ETGW_ProjecthistoryD\r\nWHERE (pidx = @pidx)\r\nORDER BY pdate DESC"; + "ETGW_ProjecthistoryD WITH (nolock)\r\nWHERE (pidx = @pidx)\r\nORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -34722,7 +34756,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata -FROM EETGW_JobReport_EBoard +FROM EETGW_JobReport_EBoard WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) ORDER BY pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 399e321..3549a67 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -105,7 +105,7 @@ WHERE (idx = @Original_idx) (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount -FROM Projects +FROM Projects WITH (nolock) WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) @@ -119,7 +119,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, @@ -133,76 +133,76 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, WHERE (idx = @Original_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, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin 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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -314,7 +314,17 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (idx = @idx) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) + AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws +FROM Projects WITH (nolock) +WHERE (idx = @idx) @@ -324,7 +334,19 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) + AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws +FROM Projects WITH (nolock) +WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) @@ -359,7 +381,7 @@ WHERE (idx = @pidx) AND (gcode = @gcode) - + DELETE FROM [ProjectsIOMap] WHERE (([idx] = @Original_idx) AND ((@IsNull_Project = 1 AND [Project] IS NULL) OR ([Project] = @Original_Project)) AND ((@IsNull_Dir = 1 AND [Dir] IS NULL) OR ([Dir] = @Original_Dir)) AND ((@IsNull_PIn = 1 AND [PIn] IS NULL) OR ([PIn] = @Original_PIn)) AND ((@IsNull_Description = 1 AND [Description] IS NULL) OR ([Description] = @Original_Description)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Remark = 1 AND [Remark] IS NULL) OR ([Remark] = @Original_Remark))) @@ -398,11 +420,11 @@ SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark FROM ProjectsIOM SELECT idx, Project, Dir, PIn, Description, wuid, wdate, Remark -FROM ProjectsIOMap +FROM ProjectsIOMap WITH (nolock) WHERE (Project = @Project) ORDER BY Dir, PIn - + @@ -644,7 +666,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, ItemModel, ItemGroup, ItemSid, ItemSupply, ItemManu, option1, option2, option3, remark, ItemSupplyidx, no, ItemUnit, import, qtyn, amtn -FROM ProjectsPart +FROM ProjectsPart WITH (nolock) WHERE (Project = @prj) ORDER BY Project, no, ItemGroup, option1, ItemName @@ -731,7 +753,7 @@ SELECT idx, Project, Item, qty, price, amt, jago, memo, wuid, wdate, ItemName, I - + @@ -1304,7 +1326,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, usermain, reqstaff, costo, costn, cnt, remark_req, remark_ans, edate, progress, memo, wuid, wdate, orderno, userprocess, category, status, workgroup, site, subcate, eepart, fanout, weekly, bef_time, aft_time, sfi -FROM EETGW_SaveCost +FROM EETGW_SaveCost WITH (nolock) ORDER BY pdate @@ -1407,7 +1429,7 @@ SELECT idx, gcode, isdel, asset, process, part, pdate, name, userManager, userma - + @@ -1468,7 +1490,7 @@ WHERE (idx = @idx) SELECT gcode, pdate, status, name, userManager, orderno, path, idx, no, Project, ItemGroup, ItemModel, ItemUnit, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemManu, Item, option1, option2, option3, qty, qtyn, price, amt, amtn, jago, remark, memo, wuid, wdate, import, qtyjago, qtybuy, qtyin, bbuy, bconfirm, crdue, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, recvUser, reqUser, bCancel, recvDate -FROM vProjectPartPurchase +FROM vProjectPartPurchase WITH (nolock) WHERE (gcode = @gcode) ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(Project, 0), idx @@ -1477,34 +1499,34 @@ ORDER BY ISNULL(bbuy, 0), ISNULL(bconfirm, 0), ISNULL(userManager, ''), ISNULL(P - + UPDATE ProjectsPart SET qtybuy = @qtybuy, qtyin = @qtyin, bbuy = @bbuy, bconfirm = @bconfirm, memo = @memo, ItemSupply = @ItemSupply, option1 = @option1, option2 = @option2, option3 = @option3, qty = @qty, price = @price, amt = @amt, ItemManu = @ItemManu, ItemSid = @ItemSid, ItemUnit = @ItemUnit, ItemModel = @ItemModel, ItemName = @ItemName, remark = @remark, recvUser = @recvUser, recvDate = @recvDate WHERE (idx = @idx) - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1560,7 +1582,11 @@ WHERE (idx = @idx) - SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) AS userGroupName, userManager, wdate, wuid FROM vProjectPartPurchase WHERE (gcode = @gcode) AND (idx = @idx) + SELECT Item, ItemGroup, ItemManu, ItemModel, ItemName, ItemSid, ItemSupply, ItemSupplyidx, ItemUnit, Project, amt, amtn, bCancel, bbuy, bconfirm, crdue, gcode, idx, import, jago, memo, name, + no, option1, option2, option3, orderno, path, pdate, price, qty, qtybuy, qtyin, qtyjago, qtyn, recvDate, recvUser, remark, reqUser, status, dbo.getPorojectgGroupUserName(Project, option3) + AS userGroupName, userManager, wdate, wuid +FROM vProjectPartPurchase WITH (nolock) +WHERE (gcode = @gcode) AND (idx = @idx) @@ -1644,9 +1670,9 @@ SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate FROM EETGW_ - + SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate -FROM EETGW_ProjecthistoryD +FROM EETGW_ProjecthistoryD WITH (nolock) WHERE (pidx = @pidx) ORDER BY pdate DESC @@ -1677,7 +1703,7 @@ SELECT idx, pidx, pdate, div, remark, remark2, mailsend, wuid, wdate FROM EETGW_ - + @@ -1949,7 +1975,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, refdata -FROM EETGW_JobReport_EBoard +FROM EETGW_JobReport_EBoard WITH (nolock) WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) ORDER BY pdate DESC @@ -2051,7 +2077,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, - + diff --git a/SubProject/FPJ0000/dsPurchase.Designer.cs b/SubProject/FPJ0000/dsPurchase.Designer.cs index 3b99e33..1719e33 100644 --- a/SubProject/FPJ0000/dsPurchase.Designer.cs +++ b/SubProject/FPJ0000/dsPurchase.Designer.cs @@ -5158,7 +5158,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumqtyReq, pumprice, pumpriceD, pumamt, supply, supplyidx, project, projectidx, asset, manuproc, edate, indate, po, dept, bigo, import, isdel, orderno, place, wuid, wdate, inqty, inremark, winuid, windate, chk1, chk2, chkremark, costcenter, linecode -FROM Purchase"; +FROM Purchase WITH (nolock)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -7250,7 +7250,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumqtyReq, pumprice, pumpriceD, pumamt, supply, supplyidx, project, projectidx, asset, manuproc, edate, indate, po, dept, bigo, import, isdel, orderno, place, wuid, wdate, inqty, inremark, winuid, windate, chk1, chk2, chkremark, costcenter, linecode -FROM EETGW_PurchaseCR"; +FROM EETGW_PurchaseCR WITH (nolock)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } diff --git a/SubProject/FPJ0000/dsPurchase.xsd b/SubProject/FPJ0000/dsPurchase.xsd index e8c79e7..f85eb8e 100644 --- a/SubProject/FPJ0000/dsPurchase.xsd +++ b/SubProject/FPJ0000/dsPurchase.xsd @@ -154,7 +154,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumqtyReq, pumprice, pumpriceD, pumamt, supply, supplyidx, project, projectidx, asset, manuproc, edate, indate, po, dept, bigo, import, isdel, orderno, place, wuid, wdate, inqty, inremark, winuid, windate, chk1, chk2, chkremark, costcenter, linecode -FROM Purchase +FROM Purchase WITH (nolock) @@ -288,7 +288,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu - + @@ -489,7 +489,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pumidx, pumscale, pumunit, pumqty, pumqtyReq, pumprice, pumpriceD, pumamt, supply, supplyidx, project, projectidx, asset, manuproc, edate, indate, po, dept, bigo, import, isdel, orderno, place, wuid, wdate, inqty, inremark, winuid, windate, chk1, chk2, chkremark, costcenter, linecode -FROM EETGW_PurchaseCR +FROM EETGW_PurchaseCR WITH (nolock) @@ -623,7 +623,7 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu - + @@ -682,218 +682,218 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu - + - + - - + + - + - + - + - + - + - + - + - - + + - + - - - - + + + + - - + + - - + + - + - + - + - + - + - + - - - + + + - + - - + + - - - + + + - - + + - + - - - - + + + + - + - + @@ -903,215 +903,215 @@ SELECT idx, gcode, pdate, state, process, receive, sc, request, sid, pumname, pu - + - - + + - + - + - + - + - + - + - + - + - - + + - + - - - - - + + + + + - - + + - - + + - + - + - + - + - + - + - - - + + + - + - + - - - + + + - - + + - - - - + + + + - + - +