From 4cf24cedaf6d4eca1fb8918f521348815192cf03 Mon Sep 17 00:00:00 2001 From: chi Date: Mon, 20 Dec 2021 12:42:18 +0900 Subject: [PATCH] .... --- Project/Properties/AssemblyInfo.cs | 4 +- Project/fMain.Designer.cs | 74 +- Project/fMain.cs | 7 + Project/fMain.resx | 28 +- SubProject/FCM0000/DSUser.Designer.cs | 332 ++++++-- SubProject/FCM0000/DSUser.xsd | 46 +- SubProject/FCM0000/User/fUserAuth.Designer.cs | 119 +-- SubProject/FCOMMON/Auth.cs | 1 + .../FPJ0000/EBoard/fEboardList.Designer.cs | 2 +- SubProject/FPJ0000/FPJ0000.csproj | 18 + .../FPJ0000/JobReport_/fJobReport.Designer.cs | 2 +- SubProject/FPJ0000/JobReport_/fJobReport.cs | 7 + .../JobReport_/fJobReport_Add.Designer.cs | 201 ++--- .../FPJ0000/JobReport_/fJobReport_Add.cs | 28 + .../FPJ0000/JobReport_/fJobReport_Add.resx | 30 +- .../FPJ0000/OtConfirm/fOTConfirm.Designer.cs | 728 ++++++++++++++++++ SubProject/FPJ0000/OtConfirm/fOTConfirm.cs | 493 ++++++++++++ SubProject/FPJ0000/OtConfirm/fOTConfirm.resx | 259 +++++++ .../OtConfirm/fOTConfirmValue.Designer.cs | 133 ++++ .../FPJ0000/OtConfirm/fOTConfirmValue.cs | 35 + .../FPJ0000/OtConfirm/fOTConfirmValue.resx | 120 +++ .../Project/fPartBuyStatus.Designer.cs | 2 +- .../FPJ0000/Project/fPartList.Designer.cs | 2 +- .../FPJ0000/Project/fProjectList.Designer.cs | 2 +- .../Project/fProjectSummary.Designer.cs | 2 +- .../FPJ0000/Properties/Resources.Designer.cs | 10 - SubProject/FPJ0000/Properties/Resources.resx | 3 - .../SaveCost/fSaveCostList.Designer.cs | 2 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 376 ++++----- SubProject/FPJ0000/dsPRJ.xsd | 74 +- SubProject/FPJ0000/dsPRJ.xss | 10 +- 31 files changed, 2585 insertions(+), 565 deletions(-) create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirm.cs create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirm.resx create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs create mode 100644 SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 4acc764..549affa 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("21.12.13.1000")] -[assembly: AssemblyFileVersion("21.12.13.1000")] +[assembly: AssemblyVersion("21.12.20.1230")] +[assembly: AssemblyFileVersion("21.12.20.1230")] diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 5c43c97..a1a1273 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -121,6 +121,8 @@ this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator(); + this.휴일연장근무승인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -382,21 +384,21 @@ // 목록ToolStripMenuItem1 // this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1"; - this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24); this.목록ToolStripMenuItem1.Text = "목록"; this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click); // // 자동입력ToolStripMenuItem // this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem"; - this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.자동입력ToolStripMenuItem.Text = "자동입력"; this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click); // // 양식ToolStripMenuItem // this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem"; - this.양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.양식ToolStripMenuItem.Text = "양식"; this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click); // @@ -445,14 +447,14 @@ // 관리ToolStripMenuItem // this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem"; - this.관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); this.관리ToolStripMenuItem.Text = "재고 관리"; this.관리ToolStripMenuItem.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click); // // 재고현황ToolStripMenuItem // this.재고현황ToolStripMenuItem.Name = "재고현황ToolStripMenuItem"; - this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); this.재고현황ToolStripMenuItem.Text = "재고 현황"; this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click); // @@ -460,7 +462,7 @@ // this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem"; - this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24); this.pMP현황ToolStripMenuItem.Text = "PMP 현황"; this.pMP현황ToolStripMenuItem.Visible = false; this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click); @@ -498,6 +500,8 @@ // 휴가관리ToolStripMenuItem // this.휴가관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.휴일연장근무승인ToolStripMenuItem, + this.toolStripMenuItem9, this.근태입력ToolStripMenuItem, this.근로명부ToolStripMenuItem}); this.휴가관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Tomato; @@ -510,14 +514,14 @@ // 근태입력ToolStripMenuItem // this.근태입력ToolStripMenuItem.Name = "근태입력ToolStripMenuItem"; - this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(148, 24); + this.근태입력ToolStripMenuItem.Size = new System.Drawing.Size(201, 24); this.근태입력ToolStripMenuItem.Text = "근태입력"; this.근태입력ToolStripMenuItem.Click += new System.EventHandler(this.근태입력ToolStripMenuItem_Click); // // 근로명부ToolStripMenuItem // this.근로명부ToolStripMenuItem.Name = "근로명부ToolStripMenuItem"; - this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(148, 24); + this.근로명부ToolStripMenuItem.Size = new System.Drawing.Size(201, 24); this.근로명부ToolStripMenuItem.Text = "근로자명부"; this.근로명부ToolStripMenuItem.Click += new System.EventHandler(this.근로명부ToolStripMenuItem_Click); // @@ -563,39 +567,39 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -604,7 +608,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -613,7 +617,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -621,7 +625,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -629,7 +633,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -638,7 +642,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -647,7 +651,7 @@ // this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red; this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24); this.toolStripMenuItem5.Text = "(test)휴가등록"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -833,7 +837,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1062, 594); + this.tabControl1.Size = new System.Drawing.Size(1065, 594); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); @@ -849,9 +853,9 @@ this.toolStripMenuItem6, this.toolStripButton1, this.toolStripButton2}); - this.toolStrip1.Location = new System.Drawing.Point(1063, 28); + this.toolStrip1.Location = new System.Drawing.Point(1066, 28); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(32, 594); + this.toolStrip1.Size = new System.Drawing.Size(29, 594); this.toolStrip1.TabIndex = 35; this.toolStrip1.Text = "toolStrip1"; // @@ -860,7 +864,7 @@ this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem8.Size = new System.Drawing.Size(26, 20); this.toolStripMenuItem8.Text = "업무일지"; this.toolStripMenuItem8.ToolTipText = "업무일지"; this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); @@ -870,7 +874,7 @@ this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem7.Size = new System.Drawing.Size(26, 20); this.toolStripMenuItem7.Text = "구매신청"; this.toolStripMenuItem7.ToolTipText = "구매신청"; this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); @@ -880,7 +884,7 @@ this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem6.Size = new System.Drawing.Size(26, 20); this.toolStripMenuItem6.Text = "프로젝트"; this.toolStripMenuItem6.ToolTipText = "프로젝트"; this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); @@ -891,7 +895,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(29, 20); + this.toolStripButton1.Size = new System.Drawing.Size(26, 20); this.toolStripButton1.Text = "구매진행상황"; this.toolStripButton1.ToolTipText = "구매진행상황"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_2); @@ -902,10 +906,22 @@ 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(29, 20); + this.toolStripButton2.Size = new System.Drawing.Size(26, 20); this.toolStripButton2.Text = "품목정보"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // + // toolStripMenuItem9 + // + this.toolStripMenuItem9.Name = "toolStripMenuItem9"; + this.toolStripMenuItem9.Size = new System.Drawing.Size(198, 6); + // + // 휴일연장근무승인ToolStripMenuItem + // + this.휴일연장근무승인ToolStripMenuItem.Name = "휴일연장근무승인ToolStripMenuItem"; + this.휴일연장근무승인ToolStripMenuItem.Size = new System.Drawing.Size(201, 24); + this.휴일연장근무승인ToolStripMenuItem.Text = "휴일/연장근무 승인"; + this.휴일연장근무승인ToolStripMenuItem.Click += new System.EventHandler(this.휴일연장근무승인ToolStripMenuItem_Click); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1029,6 +1045,8 @@ private System.Windows.Forms.ToolStripMenuItem 양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 설명서ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 라이선스ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 휴일연장근무승인ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem9; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b0da100..56f22b5 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -1063,5 +1063,12 @@ namespace Project { } + + private void 휴일연장근무승인ToolStripMenuItem_Click(object sender, EventArgs e) + { + string formkey = "OTCONFIRM"; + if (!ShowForm(formkey)) + AddForm(formkey, new FPJ0000.fOTConfirm()); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index ea905b5..7cf9e44 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -431,20 +431,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amJ2gMGOjf5seoCgJkSXoNEs - asZIhG3MDvkZ3T4YlJYfnZ10WGTU0dIWWqD8FChbhpYiW7HRyegUh2QzJrolurDVpTrXBafFYDwjIdNr - 5V2XbGTZndwnT577+p73ed9PNlipZq29FWr6JRW9+5X0aJV0lStwlaXjLNmIvXgj1qINfKRJo3X3egTg - 7+/cD/f5ThbnOoifc/LXV3ZunbHxx+mjLIQs3DzVQkuhXAAWIp8dIj5nJTZRdNfje7jhf4vrJwr5zbeD - aP+bXOvOI+LcxpW21/jFpeF3v5nmbPntBEBVOmXbLr4YbtrC1OEXMeWnEjyYzXhDNqOG5xmufk7U3NpM - 7CUZ/OxrJNiYywc7nhyQrcorqS9eGq1m/uT7TNY/LZo/1m1mpHITA/vUdO9ViVqbRsknlr1ccO5PhFMW - D+auSxGAPknxyrgph1tftxNqekk0D1VsordcRWeJCluRUtRaNZv5sf89julzaMx/olSE76lHqxg759rD - 9z4Ds4P1THsMfNGtJ+TWc6qjhk8dOqZctXzelI+pIPXbZOyu+gyZjw9IytCRcsXtzq3p/629qtVtN++U - r56ZwwWp/1t2p7mTUZnMV5meMiip/wk2v86cV/eAZwd0zPTrONtbzZmeKk53VTHplOire5nWQvlRARjc - p4pOtmzj/HAtwUNbmGh4lvH6LPx1WZwwZDGiy8R74Bk8UgYubQbDxu2M2SS6anISE8lDsu7ytH/ngyaC - xhcYq3lKLOtRbt6pwG14g5MdteJIAnBz1k7syyauT77LrxN1RAM6ro0e4OqIlnlvKZc9Rfzk2sUlewEX - 2/L4wZJ4UCOm1X0kAd+0J0JlRI7v4nivDY/HIzzjeJsLllyOfGjGaDSi1+tZjJYJX/GZxEQCcOOslYUZ - B7FwOwFfF7FYjEgkgt/vx+FwEA6HWV5epqqygstDjSL8AOD+P87VkMf09DTxeJyVlRXhpaUlAoEAOs2r - Yuz7dyJuYq2sVus7ZrM5em9sSZL+LC4uHtJoNI8lW5KSye4AYVs1P57vH+4AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJtlGIZ7amI8wLCKoz/bPEBQ46JL0GiM + LmMkwjZmh/yMbh8MSsuPbt3oWJFRR0tbaIHyU6C4DC1FtrJGJ6NTHJLNmOiWuIXZLdW5LmxaDMYzEjK9 + LO+6ZCPGO7lPnjz39T3v876fbKBCzWp7y9X0SSp69irp1irpLFPgKk3HWbwWe9FarIVP86EmjZadTyEA + f3zr/m9f6GBhtp34eSe/f2nn7lkbd84cYz5k4fapZpoL5AIwHzl9kPisldh44X2P7eKW/x1unijgF982 + on1vc6Mrl4hzC9da3+S6S8OvfjNNL8rvJQCqkknbVvHFcOMmJg+/jCkvleD+jYzVb2TE8AJDVc+Lmlub + ib04gyu+BoINORzZtqZftiKvpL50eaSKuZOHmKh7RjR/rFvPcMU6+veo6dqtErVWjZJPLLu56NybCKcs + 7M95IkUAeiXFa2OmbO5+1Uao8RXRPFi+jp4yFR3FKmyFSlFr0aznh74DfKTPpiHvyRIRfqBurWL0vGsX + 3/kMzAzUMeUx8HmXnpBbz6n2aj516Jh01fBZYx6m/NRvkrH76jVkPt4vKUNHyxT3Ot5I/3v1Va1su2m7 + fOXMHM5P/ceyM82djMpkvor0lAFJ/Wew6S1mvbpHPNOvY7pPx7meKs52V3Kms5IJp0Rv7au0FMiPCcDA + HlV0onkLF4ZqCB7cxHj9c4zVZeGvzeKEIYthXSbefc/ikTJwaTMYMm5l1CbRWZ2dmEgeknWVpf01FzQR + NL7EaPUGsaz/c9N2BW7DZk6214gjCcDtGTuxLxq5OfE+P4/XEg3ouDGyj5+Gtcx5S7jqKeRH1w4u2/O5 + 1JrL95bEgxo2rewjCfi6LREqJXJ8B8d7bHg8HuFpx7tctORw9AMzRqMRvV7PQrRU+JrPJCYSgFvnrMxP + O4iF2wj4OonFYkQiEfx+Pw6Hg3A4zNLSEpUV5VwdbBDhRwAP/3Gu+lympqaIx+MsLy8LLy4uEggE0Gle + F2M/vBNxE6tltVrfM5vN0QdjS5L0W1FR0aBGo3ks2ZKUTPYvXgs1Psouy34AAAAASUVORK5CYII= diff --git a/SubProject/FCM0000/DSUser.Designer.cs b/SubProject/FCM0000/DSUser.Designer.cs index 4f51d17..f8d388a 100644 --- a/SubProject/FCM0000/DSUser.Designer.cs +++ b/SubProject/FCM0000/DSUser.Designer.cs @@ -1218,6 +1218,12 @@ namespace FCM0000 { private global::System.Data.DataColumn columnscheapp; + private global::System.Data.DataColumn columnequipment; + + private global::System.Data.DataColumn columnkusul; + + private global::System.Data.DataColumn columnotconfirm; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public AuthDataTable() { @@ -1323,6 +1329,30 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn equipmentColumn { + get { + return this.columnequipment; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn kusulColumn { + get { + return this.columnkusul; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn otconfirmColumn { + get { + return this.columnotconfirm; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1360,7 +1390,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp) { + public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp, int equipment, int kusul, int otconfirm) { AuthRow rowAuthRow = ((AuthRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1371,7 +1401,10 @@ namespace FCM0000 { project, jobreport, savecost, - scheapp}; + scheapp, + equipment, + kusul, + otconfirm}; rowAuthRow.ItemArray = columnValuesArray; this.Rows.Add(rowAuthRow); return rowAuthRow; @@ -1410,6 +1443,9 @@ namespace FCM0000 { this.columnjobreport = base.Columns["jobreport"]; this.columnsavecost = base.Columns["savecost"]; this.columnscheapp = base.Columns["scheapp"]; + this.columnequipment = base.Columns["equipment"]; + this.columnkusul = base.Columns["kusul"]; + this.columnotconfirm = base.Columns["otconfirm"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1433,6 +1469,12 @@ namespace FCM0000 { base.Columns.Add(this.columnsavecost); this.columnscheapp = new global::System.Data.DataColumn("scheapp", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnscheapp); + this.columnequipment = new global::System.Data.DataColumn("equipment", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnequipment); + this.columnkusul = new global::System.Data.DataColumn("kusul", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnkusul); + this.columnotconfirm = new global::System.Data.DataColumn("otconfirm", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotconfirm); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2324,6 +2366,54 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int equipment { + get { + try { + return ((int)(this[this.tableAuth.equipmentColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'equipment\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableAuth.equipmentColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int kusul { + get { + try { + return ((int)(this[this.tableAuth.kusulColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'kusul\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableAuth.kusulColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int otconfirm { + get { + try { + return ((int)(this[this.tableAuth.otconfirmColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Auth\' 테이블의 \'otconfirm\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableAuth.otconfirmColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsuserNull() { @@ -2407,6 +2497,42 @@ namespace FCM0000 { public void SetscheappNull() { this[this.tableAuth.scheappColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsequipmentNull() { + return this.IsNull(this.tableAuth.equipmentColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetequipmentNull() { + this[this.tableAuth.equipmentColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IskusulNull() { + return this.IsNull(this.tableAuth.kusulColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetkusulNull() { + this[this.tableAuth.kusulColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsotconfirmNull() { + return this.IsNull(this.tableAuth.otconfirmColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetotconfirmNull() { + this[this.tableAuth.otconfirmColumn] = global::System.Convert.DBNull; + } } /// @@ -4144,10 +4270,13 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te tableMapping.ColumnMappings.Add("jobreport", "jobreport"); tableMapping.ColumnMappings.Add("savecost", "savecost"); tableMapping.ColumnMappings.Add("scheapp", "scheapp"); + tableMapping.ColumnMappings.Add("equipment", "equipment"); + tableMapping.ColumnMappings.Add("kusul", "kusul"); + tableMapping.ColumnMappings.Add("otconfirm", "otconfirm"); 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 [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm)))"; 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_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4165,10 +4294,16 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", 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 [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4178,10 +4313,13 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", 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 [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user]"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm))); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = @idx) ORDER BY [user]"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4191,6 +4329,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", 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_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4207,6 +4348,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_equipment", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "equipment", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kusul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kusul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otconfirm", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otconfirm", 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, "", "", "")); } @@ -4224,7 +4371,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche" + - "app\r\nFROM Auth\r\nWHERE (gcode = @gcode)\r\nORDER BY [user]"; + "app, equipment, kusul, otconfirm\r\nFROM Auth\r\nWHERE (gcode = @gcode)\r\nORDER " + + "BY [user]"; 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, "", "", "")); } @@ -4298,7 +4446,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport, global::System.Nullable Original_savecost, global::System.Nullable Original_scheapp) { + public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport, global::System.Nullable Original_savecost, global::System.Nullable Original_scheapp, global::System.Nullable Original_equipment, global::System.Nullable Original_kusul, global::System.Nullable Original_otconfirm) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_user == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -4362,6 +4510,30 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value; } + if ((Original_equipment.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[17].Value = ((int)(Original_equipment.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[17].Value = global::System.DBNull.Value; + } + if ((Original_kusul.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[19].Value = ((int)(Original_kusul.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[19].Value = global::System.DBNull.Value; + } + if ((Original_otconfirm.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[21].Value = ((int)(Original_otconfirm.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[21].Value = global::System.DBNull.Value; + } 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)) { @@ -4382,7 +4554,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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 user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport, global::System.Nullable savecost, global::System.Nullable scheapp) { + public virtual int Insert(string user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport, global::System.Nullable savecost, global::System.Nullable scheapp, global::System.Nullable equipment, global::System.Nullable kusul, global::System.Nullable otconfirm) { if ((user == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4431,6 +4603,24 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche else { this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; } + if ((equipment.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[8].Value = ((int)(equipment.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value; + } + if ((kusul.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[9].Value = ((int)(kusul.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value; + } + if ((otconfirm.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[10].Value = ((int)(otconfirm.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; + } 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)) { @@ -4460,6 +4650,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche global::System.Nullable jobreport, global::System.Nullable savecost, global::System.Nullable scheapp, + global::System.Nullable equipment, + global::System.Nullable kusul, + global::System.Nullable otconfirm, int Original_idx, string Original_user, string Original_gcode, @@ -4469,6 +4662,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche global::System.Nullable Original_jobreport, global::System.Nullable Original_savecost, global::System.Nullable Original_scheapp, + global::System.Nullable Original_equipment, + global::System.Nullable Original_kusul, + global::System.Nullable Original_otconfirm, int idx) { if ((user == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -4518,70 +4714,112 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche else { this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); - if ((Original_user == null)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + if ((equipment.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(equipment.Value)); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_user)); + this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; + } + if ((kusul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(kusul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + } + if ((otconfirm.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(otconfirm.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx)); + if ((Original_user == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_user)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_gcode)); } if ((Original_purchase.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_purchase.Value)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_purchase.Value)); } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; } if ((Original_holyday.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_holyday.Value)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_holyday.Value)); } else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; } if ((Original_project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(Original_project.Value)); } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; } if ((Original_jobreport.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_jobreport.Value)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_jobreport.Value)); } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; } if ((Original_savecost.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_savecost.Value)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_savecost.Value)); } else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } if ((Original_scheapp.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_scheapp.Value)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(Original_scheapp.Value)); } else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(idx)); + if ((Original_equipment.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_equipment.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; + } + if ((Original_kusul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_kusul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; + } + if ((Original_otconfirm.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(Original_otconfirm.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[33].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)) { @@ -4611,6 +4849,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche global::System.Nullable jobreport, global::System.Nullable savecost, global::System.Nullable scheapp, + global::System.Nullable equipment, + global::System.Nullable kusul, + global::System.Nullable otconfirm, int Original_idx, string Original_user, string Original_gcode, @@ -4619,8 +4860,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche global::System.Nullable Original_project, global::System.Nullable Original_jobreport, global::System.Nullable Original_savecost, - global::System.Nullable Original_scheapp) { - return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_idx); + global::System.Nullable Original_scheapp, + global::System.Nullable Original_equipment, + global::System.Nullable Original_kusul, + global::System.Nullable Original_otconfirm) { + return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_equipment, Original_kusul, Original_otconfirm, Original_idx); } } diff --git a/SubProject/FCM0000/DSUser.xsd b/SubProject/FCM0000/DSUser.xsd index bb0e09f..1e3b216 100644 --- a/SubProject/FCM0000/DSUser.xsd +++ b/SubProject/FCM0000/DSUser.xsd @@ -254,7 +254,7 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te - DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))) + DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm))) @@ -272,13 +272,19 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te + + + + + + - INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user] + INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp], [equipment], [kusul], [otconfirm]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp, @equipment, @kusul, @otconfirm); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user] @@ -288,12 +294,15 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche + + + - SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp + SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (gcode = @gcode) ORDER BY [user] @@ -304,8 +313,8 @@ ORDER BY [user] - UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user] + UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp, [equipment] = @equipment, [kusul] = @kusul, [otconfirm] = @otconfirm WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)) AND ((@IsNull_equipment = 1 AND [equipment] IS NULL) OR ([equipment] = @Original_equipment)) AND ((@IsNull_kusul = 1 AND [kusul] IS NULL) OR ([kusul] = @Original_kusul)) AND ((@IsNull_otconfirm = 1 AND [otconfirm] IS NULL) OR ([otconfirm] = @Original_otconfirm))); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp, equipment, kusul, otconfirm FROM Auth WHERE (idx = @idx) ORDER BY [user] @@ -315,6 +324,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche + + + @@ -331,6 +343,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche + + + + + + @@ -347,6 +365,9 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche + + + @@ -358,7 +379,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche - + @@ -386,7 +407,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche - + @@ -513,7 +534,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche - + @@ -535,8 +556,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche - - + + + + + diff --git a/SubProject/FCM0000/User/fUserAuth.Designer.cs b/SubProject/FCM0000/User/fUserAuth.Designer.cs index 2bd9d9a..bfa6fa7 100644 --- a/SubProject/FCM0000/User/fUserAuth.Designer.cs +++ b/SubProject/FCM0000/User/fUserAuth.Designer.cs @@ -30,15 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserAuth)); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dSUser = new FCM0000.DSUser(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); @@ -103,14 +106,14 @@ this.toolStripLabel2, this.tbFind, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 601); + this.bn.Location = new System.Drawing.Point(0, 573); 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(954, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -161,6 +164,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -225,6 +229,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -281,7 +286,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(736, 601); + this.fpSpread1.Size = new System.Drawing.Size(954, 573); this.fpSpread1.TabIndex = 2; // // fpSpread1_Sheet1 @@ -290,7 +295,7 @@ 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 = 9; + this.fpSpread1_Sheet1.ColumnCount = 12; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사용자 번호"; @@ -299,78 +304,96 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무일지"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F; - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).Visible = false; this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "user"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "사용자 번호"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "gcode"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Visible = false; this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "purchase"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "구매관리"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "holyday"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "근태관리"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType11.MaximumValue = 2147483647D; - numberCellType11.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType11; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F; - numberCellType12.DecimalPlaces = 0; - numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType12.MaximumValue = 2147483647D; - numberCellType12.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType12; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "jobreport"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무일지"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 77F; - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType13; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "savecost"; - numberCellType14.DecimalPlaces = 0; - numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType14.MaximumValue = 2147483647D; - numberCellType14.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType14; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "scheapp"; + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "equipment"; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "kusul"; + numberCellType10.DecimalPlaces = 0; + numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType10.MaximumValue = 2147483647D; + numberCellType10.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "otconfirm"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; @@ -384,7 +407,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(736, 626); + this.ClientSize = new System.Drawing.Size(954, 598); this.ContextMenuStrip = this.cm1; this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); diff --git a/SubProject/FCOMMON/Auth.cs b/SubProject/FCOMMON/Auth.cs index cec7a74..2b9c659 100644 --- a/SubProject/FCOMMON/Auth.cs +++ b/SubProject/FCOMMON/Auth.cs @@ -16,6 +16,7 @@ namespace FCOMMON jobreport, savecost, equipment, + otconfirm, } public static int getAuth(eAuthType type, string uid) { diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 5e6ecce..b7bca4e 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -343,7 +343,7 @@ // btFind // this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = global::FPJ0000.Properties.Resources.find; + this.btFind.Image = global::FPJ0000.Properties.Resources.accept; this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; this.btFind.Name = "btFind"; this.btFind.Size = new System.Drawing.Size(23, 22); diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 161b4ba..e3815b6 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -265,6 +265,12 @@ fJobChartMenu.cs + + Form + + + fOTConfirm.cs + Form @@ -334,6 +340,12 @@ fNote.cs + + Form + + + fOTConfirmValue.cs + Model1.tt @@ -581,6 +593,9 @@ fJobChartMenu.cs + + fOTConfirm.cs + fJobReportAI.cs @@ -609,6 +624,9 @@ fNote.cs + + fOTConfirmValue.cs + fLayoutEdit.cs diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 6b896af..6134265 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -647,7 +647,7 @@ // toolStripButton4 // this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.find; + this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.accept; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Size = new System.Drawing.Size(34, 34); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 5537017..52b98a2 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -496,6 +496,13 @@ namespace FPJ0000 //FCOMMON.Util.MsgE("타인의 자료는 추가/변경/삭제 할 수 없습니다."); //return; } + else if(dr.ot > 0 && dr.ot2 > 0) + { + //util.MsgE("연장/휴일 근무가 관리자에의해 확정된 상태이므로 값을 변경할 수 없습니다"); + //ReadMod = true; + } + + //ot데이터가잇고 관리자 확정되엇다면 처리하지 못한다 var f = new JobReport_.fJobReport_Add(dr,false,ReadMod); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index c3e74fe..4f627cc 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -40,12 +40,14 @@ System.Windows.Forms.Label label6; System.Windows.Forms.Label label2; System.Windows.Forms.Label label7; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add)); System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; System.Windows.Forms.Label label10; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport_Add)); this.lbSummary = new System.Windows.Forms.Label(); this.tbHrs = new System.Windows.Forms.TextBox(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsPRJ = new FPJ0000.dsPRJ(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel(); @@ -64,18 +66,19 @@ this.tbProject = new System.Windows.Forms.ComboBox(); this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); this.panel1 = new System.Windows.Forms.Panel(); + this.grpkisul = new System.Windows.Forms.GroupBox(); + this.cmb_kisuldiv = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.cmb_kisullv = new System.Windows.Forms.ComboBox(); this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); this.lbTitleTip = new System.Windows.Forms.Label(); this.tbTag = new System.Windows.Forms.TextBox(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsPRJ = new FPJ0000.dsPRJ(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); - this.grpkisul = new System.Windows.Forms.GroupBox(); - this.cmb_kisullv = new System.Windows.Forms.ComboBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.cmb_kisuldiv = new System.Windows.Forms.ComboBox(); + this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbOt2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbotReason = new System.Windows.Forms.ToolStripStatusLabel(); hrsLabel = new System.Windows.Forms.Label(); typeLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -90,10 +93,10 @@ label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); label10 = new System.Windows.Forms.Label(); - this.statusStrip1.SuspendLayout(); - this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); + this.statusStrip1.SuspendLayout(); + this.panel1.SuspendLayout(); this.grpkisul.SuspendLayout(); this.SuspendLayout(); // @@ -201,6 +204,33 @@ label7.TabIndex = 23; label7.Text = "초과시간정보"; // + // label8 + // + label8.AutoSize = true; + label8.Location = new System.Drawing.Point(19, 38); + label8.Name = "label8"; + label8.Size = new System.Drawing.Size(53, 12); + label8.TabIndex = 9; + label8.Text = "기술레벨"; + // + // label9 + // + label9.AutoSize = true; + label9.Location = new System.Drawing.Point(7, 59); + label9.Name = "label9"; + label9.Size = new System.Drawing.Size(65, 12); + label9.TabIndex = 21; + label9.Text = "기술료($K)"; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new System.Drawing.Point(19, 16); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(53, 12); + label10.TabIndex = 24; + label10.Text = "기술분류"; + // // lbSummary // this.lbSummary.AutoSize = true; @@ -223,11 +253,24 @@ this.tbHrs.Text = "0.0"; this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1, - this.lbIndex}); + this.lbIndex, + this.toolStripStatusLabel2, + this.lbOt2, + this.lbotReason}); this.statusStrip1.Location = new System.Drawing.Point(0, 675); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(969, 22); @@ -442,6 +485,50 @@ this.panel1.Size = new System.Drawing.Size(969, 177); this.panel1.TabIndex = 0; // + // grpkisul + // + this.grpkisul.Controls.Add(label10); + this.grpkisul.Controls.Add(this.cmb_kisuldiv); + this.grpkisul.Controls.Add(this.textBox1); + this.grpkisul.Controls.Add(label9); + this.grpkisul.Controls.Add(this.cmb_kisullv); + this.grpkisul.Controls.Add(label8); + this.grpkisul.Location = new System.Drawing.Point(615, 87); + this.grpkisul.Name = "grpkisul"; + this.grpkisul.Size = new System.Drawing.Size(207, 82); + this.grpkisul.TabIndex = 29; + this.grpkisul.TabStop = false; + this.grpkisul.Text = "기술료"; + // + // cmb_kisuldiv + // + this.cmb_kisuldiv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_kisuldiv.FormattingEnabled = true; + this.cmb_kisuldiv.Location = new System.Drawing.Point(77, 12); + this.cmb_kisuldiv.Name = "cmb_kisuldiv"; + this.cmb_kisuldiv.Size = new System.Drawing.Size(108, 20); + this.cmb_kisuldiv.TabIndex = 23; + // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kisulamt", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N3")); + this.textBox1.Font = new System.Drawing.Font("굴림", 9F); + this.textBox1.Location = new System.Drawing.Point(77, 55); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(108, 21); + this.textBox1.TabIndex = 22; + this.textBox1.Text = "0.000"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // cmb_kisullv + // + this.cmb_kisullv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_kisullv.FormattingEnabled = true; + this.cmb_kisullv.Location = new System.Drawing.Point(77, 34); + this.cmb_kisullv.Name = "cmb_kisullv"; + this.cmb_kisullv.Size = new System.Drawing.Size(108, 20); + this.cmb_kisullv.TabIndex = 10; + // // dateTimePicker2 // this.dateTimePicker2.CustomFormat = "yyyy-MM-dd hh:mm:ss"; @@ -482,16 +569,6 @@ this.tbTag.TabIndex = 60; this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // bs - // - this.bs.DataMember = "JobReport"; - this.bs.DataSource = this.dsPRJ; - // - // dsPRJ - // - this.dsPRJ.DataSetName = "dsPRJ"; - this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // ta // this.ta.ClearBeforeFill = true; @@ -517,76 +594,23 @@ this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // grpkisul + // toolStripStatusLabel2 // - this.grpkisul.Controls.Add(label10); - this.grpkisul.Controls.Add(this.cmb_kisuldiv); - this.grpkisul.Controls.Add(this.textBox1); - this.grpkisul.Controls.Add(label9); - this.grpkisul.Controls.Add(this.cmb_kisullv); - this.grpkisul.Controls.Add(label8); - this.grpkisul.Location = new System.Drawing.Point(615, 87); - this.grpkisul.Name = "grpkisul"; - this.grpkisul.Size = new System.Drawing.Size(207, 82); - this.grpkisul.TabIndex = 29; - this.grpkisul.TabStop = false; - this.grpkisul.Text = "기술료"; + this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; + this.toolStripStatusLabel2.Size = new System.Drawing.Size(10, 17); + this.toolStripStatusLabel2.Text = "|"; // - // cmb_kisullv + // lbOt2 // - this.cmb_kisullv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_kisullv.FormattingEnabled = true; - this.cmb_kisullv.Location = new System.Drawing.Point(77, 34); - this.cmb_kisullv.Name = "cmb_kisullv"; - this.cmb_kisullv.Size = new System.Drawing.Size(108, 20); - this.cmb_kisullv.TabIndex = 10; + this.lbOt2.Name = "lbOt2"; + this.lbOt2.Size = new System.Drawing.Size(121, 17); + this.lbOt2.Text = "toolStripStatusLabel3"; // - // label8 + // lbotReason // - label8.AutoSize = true; - label8.Location = new System.Drawing.Point(19, 38); - label8.Name = "label8"; - label8.Size = new System.Drawing.Size(53, 12); - label8.TabIndex = 9; - label8.Text = "기술레벨"; - // - // textBox1 - // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kisulamt", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N3")); - this.textBox1.Font = new System.Drawing.Font("굴림", 9F); - this.textBox1.Location = new System.Drawing.Point(77, 55); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(108, 21); - this.textBox1.TabIndex = 22; - this.textBox1.Text = "0.000"; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label9 - // - label9.AutoSize = true; - label9.Location = new System.Drawing.Point(7, 59); - label9.Name = "label9"; - label9.Size = new System.Drawing.Size(65, 12); - label9.TabIndex = 21; - label9.Text = "기술료($K)"; - // - // cmb_kisuldiv - // - this.cmb_kisuldiv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_kisuldiv.FormattingEnabled = true; - this.cmb_kisuldiv.Location = new System.Drawing.Point(77, 12); - this.cmb_kisuldiv.Name = "cmb_kisuldiv"; - this.cmb_kisuldiv.Size = new System.Drawing.Size(108, 20); - this.cmb_kisuldiv.TabIndex = 23; - // - // label10 - // - label10.AutoSize = true; - label10.Location = new System.Drawing.Point(19, 16); - label10.Name = "label10"; - label10.Size = new System.Drawing.Size(53, 12); - label10.TabIndex = 24; - label10.Text = "기술분류"; + this.lbotReason.Name = "lbotReason"; + this.lbotReason.Size = new System.Drawing.Size(121, 17); + this.lbotReason.Text = "toolStripStatusLabel4"; // // fJobReport_Add // @@ -603,12 +627,12 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "업무일지 등록/변경"; this.Load += new System.EventHandler(this.fJobReport_Add_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.grpkisul.ResumeLayout(false); this.grpkisul.PerformLayout(); this.ResumeLayout(false); @@ -650,5 +674,8 @@ private System.Windows.Forms.ComboBox cmb_kisullv; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.ComboBox cmb_kisuldiv; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2; + private System.Windows.Forms.ToolStripStatusLabel lbOt2; + private System.Windows.Forms.ToolStripStatusLabel lbotReason; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 9abffbf..46311a9 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -148,6 +148,28 @@ namespace FPJ0000.JobReport_ tbTag.Text = dr.tag; + if(dr.ot > 0) + { + if(dr.ot2 == 0) + { + lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다"; + lbOt2.ForeColor = Color.Blue; + lbotReason.Visible = false; + } + else + { + lbOt2.Text = $"승인시간:{dr.ot2}"; + lbotReason.Text = $"사유:{dr.otReason}"; + } + + } + else + { + lbOt2.Visible = false; + lbotReason.Visible = false; + } + + if (getKisulInput) { cmb_kisuldiv.Text = dr.kisuldiv; @@ -210,6 +232,12 @@ namespace FPJ0000.JobReport_ this.Show(); Application.DoEvents(); + if(dr.ot > 0 && dr.ot2 > 0) + { + tbOt.Enabled = false; + FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다"); + } + //if (this.richTextBoxEx1.Text.Trim() != "") //{ // this.richTextBoxEx1.Focus(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index 6b0952d..a56d405 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -150,9 +150,21 @@ False + + False + + + False + + + False + 100, 17 + + 17, 17 + 299, 17 @@ -163,24 +175,6 @@ } - - False - - - 100, 17 - - - 17, 17 - - - False - - - False - - - 17, 17 - 164, 17 diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs new file mode 100644 index 0000000..4c1aea1 --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs @@ -0,0 +1,728 @@ +namespace FPJ0000 +{ + partial class fOTConfirm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FPJ0000.dsPRJ(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.btEdit = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); + this.dtSD = new System.Windows.Forms.ToolStripTextBox(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); + this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.lbTime = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); + this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.dv1 = new arCtl.arDatagridView(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.usernameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.requestpartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.packageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); + this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + this.toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.SuspendLayout(); + // + // bn + // + this.bn.AddNewItem = null; + this.bn.BindingSource = this.bs; + this.bn.CountItem = this.bindingNavigatorCountItem; + this.bn.DeleteItem = null; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.toolStripSeparator1, + this.toolStripLabel2, + this.tbFind, + this.btFind, + this.toolStripButton5, + this.bindingNavigatorSeparator2, + this.btEdit, + this.toolStripButton1}); + this.bn.Location = new System.Drawing.Point(0, 730); + 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(1364, 25); + this.bn.TabIndex = 0; + this.bn.Text = "bindingNavigator1"; + // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsMSSQL; + this.bs.Sort = "pdate desc"; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(31, 22); + this.toolStripLabel2.Text = "검색"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 22); + this.btFind.Text = "toolStripButton2"; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Enabled = false; + 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(63, 22); + this.toolStripButton5.Text = "보고서"; + this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + // + // btEdit + // + this.btEdit.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); + this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btEdit.Name = "btEdit"; + this.btEdit.Size = new System.Drawing.Size(66, 22); + this.btEdit.Text = "저장(&S)"; + this.btEdit.Click += new System.EventHandler(this.btEdit_Click); + // + // toolStripButton1 + // + 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(75, 22); + this.toolStripButton1.Text = "일괄승인"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; + this.tam.EETGW_JobReport_EBoardTableAdapter = null; + this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; + this.tam.EETGW_ProjectsScheduleTableAdapter = null; + this.tam.EETGW_ProjectToDoTableAdapter = null; + this.tam.EETGW_SaveCostTableAdapter = null; + this.tam.JobReportTableAdapter = this.ta; + this.tam.ProjectPartStatusTableAdapter = null; + this.tam.ProjectsHistoryTableAdapter = null; + this.tam.ProjectsIOMapTableAdapter = null; + this.tam.ProjectsMailListTableAdapter = null; + this.tam.ProjectsPartTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.SPMasterTableAdapter = null; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // toolStrip1 + // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lbStt, + this.dtSD, + this.lbEnd, + this.toolStripLabel4, + this.dtED, + this.lbTime, + this.toolStripSeparator2, + this.toolStripLabel1, + this.tbProcess, + this.toolStripButton4, + this.toolStripLabel3, + this.cmbUser, + this.btSearch, + this.toolStripButton2}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(1364, 37); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // lbStt + // + this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbStt.ForeColor = System.Drawing.Color.Blue; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(43, 34); + this.lbStt.Text = "시작일"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); + // + // dtSD + // + this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.dtSD.Name = "dtSD"; + this.dtSD.Size = new System.Drawing.Size(90, 37); + this.dtSD.Text = "1982-11-23"; + this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lbEnd + // + this.lbEnd.Name = "lbEnd"; + this.lbEnd.Size = new System.Drawing.Size(15, 34); + this.lbEnd.Text = "~"; + // + // toolStripLabel4 + // + this.toolStripLabel4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.toolStripLabel4.ForeColor = System.Drawing.Color.Blue; + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(43, 34); + this.toolStripLabel4.Text = "종료일"; + this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); + // + // dtED + // + this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.dtED.Name = "dtED"; + this.dtED.Size = new System.Drawing.Size(90, 37); + this.dtED.Text = "1982-11-23"; + this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lbTime + // + this.lbTime.Name = "lbTime"; + this.lbTime.Size = new System.Drawing.Size(29, 34); + this.lbTime.Text = "{0}h"; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); + this.toolStripLabel1.Text = "공정"; + // + // tbProcess + // + this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(350, 37); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(23, 34); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(43, 34); + this.toolStripLabel3.Text = "사용자"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); + // + // cmbUser + // + this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbUser.Name = "cmbUser"; + this.cmbUser.Size = new System.Drawing.Size(200, 37); + this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); + this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click); + // + // btSearch + // + this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); + this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSearch.Name = "btSearch"; + this.btSearch.Size = new System.Drawing.Size(92, 34); + this.btSearch.Text = "조회(&R)"; + this.btSearch.ButtonClick += new System.EventHandler(this.btSearch_ButtonClick); + this.btSearch.Click += new System.EventHandler(this.btSearch_Click); + // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; + this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(1364, 91); + this.richTextBox1.TabIndex = 5; + this.richTextBox1.Text = ""; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 37); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.dv1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.richTextBox1); + this.splitContainer1.Size = new System.Drawing.Size(1364, 693); + this.splitContainer1.SplitterDistance = 592; + this.splitContainer1.SplitterWidth = 10; + this.splitContainer1.TabIndex = 6; + // + // dv1 + // + this.dv1.A_DelCurrentCell = true; + this.dv1.A_EnterToTab = true; + this.dv1.A_KoreanField = null; + this.dv1.A_UpperField = null; + this.dv1.A_ViewRownumOnHeader = true; + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.pdateDataGridViewTextBoxColumn, + this.wwDataGridViewTextBoxColumn, + this.usernameDataGridViewTextBoxColumn, + this.requestpartDataGridViewTextBoxColumn, + this.packageDataGridViewTextBoxColumn, + this.statusDataGridViewTextBoxColumn, + this.svalueDataGridViewTextBoxColumn, + this.projectNameDataGridViewTextBoxColumn, + this.otDataGridViewTextBoxColumn, + this.ot2DataGridViewTextBoxColumn, + this.otReasonDataGridViewTextBoxColumn, + this.otStartDataGridViewTextBoxColumn, + this.otEnd, + this.descriptionDataGridViewTextBoxColumn}); + this.dv1.DataSource = this.bs; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(1364, 592); + this.dv1.TabIndex = 3; + this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); + // + // pdateDataGridViewTextBoxColumn + // + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + this.pdateDataGridViewTextBoxColumn.Width = 54; + // + // wwDataGridViewTextBoxColumn + // + this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + this.wwDataGridViewTextBoxColumn.HeaderText = "WW"; + this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; + this.wwDataGridViewTextBoxColumn.ReadOnly = true; + this.wwDataGridViewTextBoxColumn.Width = 50; + // + // usernameDataGridViewTextBoxColumn + // + this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; + this.usernameDataGridViewTextBoxColumn.HeaderText = "담당"; + this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; + this.usernameDataGridViewTextBoxColumn.ReadOnly = true; + this.usernameDataGridViewTextBoxColumn.Width = 54; + // + // requestpartDataGridViewTextBoxColumn + // + this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; + this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; + this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; + this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; + this.requestpartDataGridViewTextBoxColumn.Width = 78; + // + // packageDataGridViewTextBoxColumn + // + this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; + this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; + this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; + this.packageDataGridViewTextBoxColumn.ReadOnly = true; + this.packageDataGridViewTextBoxColumn.Width = 66; + // + // statusDataGridViewTextBoxColumn + // + this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + this.statusDataGridViewTextBoxColumn.HeaderText = "상태"; + this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; + this.statusDataGridViewTextBoxColumn.ReadOnly = true; + this.statusDataGridViewTextBoxColumn.Width = 54; + // + // svalueDataGridViewTextBoxColumn + // + this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue"; + this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; + this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; + this.svalueDataGridViewTextBoxColumn.ReadOnly = true; + this.svalueDataGridViewTextBoxColumn.Width = 78; + // + // projectNameDataGridViewTextBoxColumn + // + this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; + this.projectNameDataGridViewTextBoxColumn.HeaderText = "프로젝트(아이템)"; + this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; + this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; + this.projectNameDataGridViewTextBoxColumn.Width = 87; + // + // otDataGridViewTextBoxColumn + // + this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle4.Format = "N1"; + this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + this.otDataGridViewTextBoxColumn.HeaderText = "초과"; + this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; + this.otDataGridViewTextBoxColumn.ReadOnly = true; + this.otDataGridViewTextBoxColumn.Width = 51; + // + // ot2DataGridViewTextBoxColumn + // + this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle5.Format = "N1"; + this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; + this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; + this.ot2DataGridViewTextBoxColumn.Width = 51; + // + // otReasonDataGridViewTextBoxColumn + // + this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; + this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; + this.otReasonDataGridViewTextBoxColumn.Width = 51; + // + // otStartDataGridViewTextBoxColumn + // + this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle7.Format = "HH:mm:ss"; + this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; + this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; + this.otStartDataGridViewTextBoxColumn.ReadOnly = true; + this.otStartDataGridViewTextBoxColumn.Width = 51; + // + // otEnd + // + this.otEnd.DataPropertyName = "otEnd"; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle8.Format = "HH:mm:ss"; + this.otEnd.DefaultCellStyle = dataGridViewCellStyle8; + this.otEnd.HeaderText = "종료"; + this.otEnd.Name = "otEnd"; + this.otEnd.ReadOnly = true; + this.otEnd.Width = 51; + // + // descriptionDataGridViewTextBoxColumn + // + this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; + this.descriptionDataGridViewTextBoxColumn.HeaderText = "비고"; + this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; + this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; + this.descriptionDataGridViewTextBoxColumn.Width = 51; + // + // fOTConfirm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1364, 755); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.bn); + this.Name = "fOTConfirm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "휴일/연장근무 승인"; + this.Load += new System.EventHandler(this.@__Load); + ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); + this.bn.ResumeLayout(false); + this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private dsPRJ dsMSSQL; + private System.Windows.Forms.BindingSource bs; + private dsPRJTableAdapters.TableAdapterManager tam; + private System.Windows.Forms.BindingNavigator bn; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel lbStt; + private System.Windows.Forms.ToolStripTextBox dtSD; + private System.Windows.Forms.ToolStripLabel lbEnd; + private System.Windows.Forms.ToolStripTextBox dtED; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel3; + private dsPRJTableAdapters.JobReportTableAdapter ta; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripTextBox tbFind; + private System.Windows.Forms.ToolStripButton btFind; + private System.Windows.Forms.ToolStripComboBox cmbUser; + private System.Windows.Forms.ToolStripLabel lbTime; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.ToolStripSplitButton btSearch; + private System.Windows.Forms.ToolStripLabel toolStripLabel4; + private System.Windows.Forms.ToolStripTextBox tbProcess; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.SplitContainer splitContainer1; + private arCtl.arDatagridView dv1; + private System.Windows.Forms.ToolStripButton btEdit; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn usernameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn requestpartDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn packageDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn statusDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn ot2DataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otReasonDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otEnd; + private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs new file mode 100644 index 0000000..f01511b --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs @@ -0,0 +1,493 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using util = FCOMMON.Util; + +namespace FPJ0000 +{ + public partial class fOTConfirm : FCOMMON.fBase + { + string fn_fpcolsize = ""; + public fOTConfirm() + { + InitializeComponent(); + fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); + this.dsMSSQL.JobReport.TableNewRow += Projects_TableNewRow; + this.FormClosed += __Closed; + + dtSD.KeyDown += dtSD_KeyDown; + dtED.KeyDown += dtSD_KeyDown; + + } + + void __Closed(object sender, FormClosedEventArgs e) + { + + } + + Boolean binit = false; + + void UpdateUserList() + { + //담당자목록 - 사용자목록으로 처리한다. + this.cmbUser.Items.Clear(); + this.cmbUser.Items.Add("-- 전체 --"); + var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); + + var prclist = this.tbProcess.Tag as List; + if (prclist.Count < 1) + { + var processStr = "%"; + var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessUserListRow dr in dtUserList) + { + string cmbdata = string.Format("{1}({0})", dr.id, dr.name); + this.cmbUser.Items.Add(cmbdata); + } + } + else + { + foreach (var prc in prclist) + { + var processStr = prc;// cmbProcess.Text; + var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessUserListRow dr in dtUserList) + { + string cmbdata = string.Format("{1}({0})", dr.id, dr.name); + this.cmbUser.Items.Add(cmbdata); + } + } + } + } + + private bool getKisulInput + { + get + { + return FCOMMON.Util.getBit( + FCOMMON.info.Login.gpermission, + (int)FCOMMON.eGroupPermission.jobreport_kisul); + } + } + private void __Load(object sender, EventArgs e) + { + this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01"); + var sdate = DateTime.Parse(dtSD.Text); + this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString(); + + //공정목록 + var taProc = new dsReportTableAdapters.ProcessListTableAdapter(); + var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode); + //cmbProcess.Items.Clear(); + //cmbProcess.Items.Add("--전체--"); + //foreach (dsReport.ProcessListRow dr in dtProcList) + //{ + // cmbProcess.Items.Add(dr.processs); + //} + //cmbProcess.Text = FCOMMON.info.Login.process; + //if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함 + + tbProcess.Text = FCOMMON.info.Login.process; + tbProcess.Tag = new List(new string[] { FCOMMON.info.Login.process }); + + //담당자목록 - 사용자목록으로 처리한다. + string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no); + // if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)"; + // this.cmbUser.Items.Add(namestr); + UpdateUserList(); //현재사용자의 이름을 반환한다 + + if (cmbUser.Items.Count > 0) + cmbUser.SelectedIndex = 0; + + if (cmbUser.SelectedIndex < 0) + { + //내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다 + this.cmbUser.Items.Add(namestr); + cmbUser.Text = namestr; + } + + + //var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); + //foreach (var user in userList) + //{ + // this.cmbUser.Items.Add(user); + //} + + + //state list + //var stList = FCOMMON.DBM.getCodeList("05"); + //this.cmbState.Items.Clear(); + //cmbState.Items.Add("-- All --"); + //// cmbState.Items.Add("-- incomplete --"); + //foreach (var item in stList) + // cmbState.Items.Add(item); + //this.cmbState.SelectedIndex = 0; + + + //일반사용자의경우에는 상태를 변경하지 못한다. + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport)); + if (curLevel >= 5) + { + + } + + + //210930- + if (FCOMMON.info.NotShowJobReportview) + this.splitContainer1.Panel2Collapsed = true; + + refreshData(); + binit = true; + + + } + + private void cmbProcess_SelectedIndexChanged(object sender, EventArgs e) + { + if (binit == false) return; + UpdateUserList(); + } + private void cmbProcess_Click(object sender, EventArgs e) + { + + } + void RefreshTime() + { + lbTime.Text = "--h"; + + //사용자번호추적 + if (cmbUser.Text.Trim() == "") + { + //FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다."); + return; + } + if (cmbUser.Text.IndexOf("(") == -1 || cmbUser.Text.IndexOf(")") == -1) + { + // FCOMMON.Util.MsgE("담당자 번호를 확인할 수 없습니다.(문의 T.8567)"); + return; + } + string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); + request = request.Substring(0, request.Length - 1); + + float work, ot; + int total; + FCOMMON.DBM.getWorkTime(request, this.dtSD.Text.Substring(0, 7), out work, out total, out ot); + lbTime.Text = string.Format(" {0}h/{2}h, OT:{1}h", work, ot, total); + } + void dtSD_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode != Keys.Enter) return; + var tb = sender as ToolStripTextBox; + var input = tb.Text.Trim(); + if (input == "") tb.Text = DateTime.Now.ToShortDateString(); + else + { + string dt = string.Empty; + if (!util.MakeDateString(input, out dt)) + { + FCOMMON.Util.MsgE("입력값이 올바르지 않습니다."); + tb.SelectAll(); + tb.Focus(); + return; + } + else + { + tb.Text = dt; + } + } + if (tb == dtSD) + { + dtED.Focus(); + dtED.SelectAll(); + } + else + { + btSearch.PerformClick(); + tb.SelectAll(); + } + } + + void refreshData() + { + // string state = "%"; + // if (cmbState.SelectedIndex > 0) state = cmbState.Text.Split(',')[0].Substring(1); + + //사용자번호추적 + if (cmbUser.Text.Trim() == "") + { + FCOMMON.Util.MsgE("담당자가 선택되지 않았습니다."); + return; + } + if (cmbUser.SelectedIndex > 0 && (cmbUser.Text.IndexOf("(") == -1 || cmbUser.Text.IndexOf(")") == -1)) + { + FCOMMON.Util.MsgE("담당자 번호를 확인할 수 없습니다.(문의 T.8567)"); + return; + } + + string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); + request = request.Substring(0, request.Length - 1); + if (cmbUser.SelectedIndex == 0) request = "%"; //전체검색 201028 - chi(임현대) + + + //사용자 목록다중선택으로 인해 처리 + var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue"; + sql += " FROM JobReport"; + sql += " WHERE (pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)"; + sql += " and isnull(ot,0) > 0"; + if (request != "%") + { + //사용자가 지정되어있다 + sql += $" AND uid = '{request}'"; + } + else + { + //전체사용자가 지정되어있다. 해당하는 사용자 목록에서만 취한다. + var userlist = new List(); + for (int i = 1; i < cmbUser.Items.Count; i++) //0번요소는 전체이다 + { + var userinfo = cmbUser.Items[i].ToString(); + var userno = userinfo.Substring(userinfo.LastIndexOf('(') + 1); + userno = userno.Substring(0, userno.Length - 1); + userlist.Add(userno); + } + sql += " and uid in ('" + string.Join("','", userlist) + "')"; + } + + + sql += " ORDER BY pdate DESC"; + + var cmd = new System.Data.SqlClient.SqlCommand(sql, ta.Connection); + cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = dtSD.Text; + cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = dtED.Text; + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode; + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + + dsMSSQL.JobReport.Clear(); + da.Fill(this.dsMSSQL.JobReport); + dsMSSQL.JobReport.AcceptChanges(); + + RefreshTime(); + FormattingData(); + + + } + void FormattingData() + { + + + } + void funcSave() + { + this.Validate(); + this.bs.EndEdit(); + try + { + var cnt = ta.Update(this.dsMSSQL.JobReport); + util.MsgI($"{cnt}건의 자료가 저장되었습니다"); + //this.tam.UpdateAll(this.dsMSSQL); + FormattingData(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); + } + } + + void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) + { + e.Row["gcode"] = FCOMMON.info.Login.gcode; + e.Row["pdate"] = DateTime.Now.ToShortDateString(); + e.Row["wuid"] = FCOMMON.info.Login.no; + e.Row["wdate"] = DateTime.Now; + e.Row["status"] = "진행 완료";//other + e.Row["uid"] = FCOMMON.info.Login.no; //이름을 직접 기록 + e.Row["hrs"] = 8.0; + e.Row["ot"] = 0.0; + } + + private void refreshToolStripMenuItem_Click(object sender, EventArgs e) + { + refreshData(); + } + + private void partListToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.ProjectsRow; + var f = new fPartList(dr.idx); + f.MdiParent = this.MdiParent; + f.Show(); + } + + + private void autoToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void resetToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void loadToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void btSearch_Click(object sender, EventArgs e) + { + + } + + private void toolStripLabel3_Click(object sender, EventArgs e) + { + //사용자목록처리 + var namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no); ; + if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)"; + this.cmbUser.Text = namestr; + refreshData(); + } + + + private void btFind_Click(object sender, EventArgs e) + { + var search = tbFind.Text.Trim(); + search = search.Replace("*", "x"); + if (tbFind.Text != search) tbFind.Text = search; + try + { + if (search.Trim() == "") + { + this.bs.Filter = ""; + tbFind.BackColor = Color.White; + } + else + { + search = search.Replace("'", "''"); + var collist = new string[] { "requestpart", "package", "projectname", "process", "[type]", "description", "tag" }; + string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?"; + foreach (var col in collist) + { + if (filter != "") filter += " or "; + filter += col + " like ?"; + } + filter = filter.Replace("?", "'%" + search + "%'"); + this.bs.Filter = filter; + tbFind.BackColor = Color.Lime; + } + tbFind.SelectAll(); + tbFind.Focus(); + } + catch (Exception ex) + { + this.tbFind.BackColor = Color.Tomato; + FCOMMON.Util.MsgE(ex.Message); + } + } + + private void tbFind_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) btFind.PerformClick(); + } + + private void btEdit_Click(object sender, EventArgs e) + { + funcSave(); + } + + private void lbStt_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text)); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01"); + dtSD.Text = sdDate.ToShortDateString(); + if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString()) + dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString(); + else + dtED.Text = f.dtPick.SelectionEnd.ToShortDateString(); + refreshData(); + } + + + + private void cmbUser_Click(object sender, EventArgs e) + { + + } + + private void cmbUser_SelectedIndexChanged(object sender, EventArgs e) + { + RefreshTime(); + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btSearch_ButtonClick(object sender, EventArgs e) + { + refreshData(); + } + + private void toolStripLabel4_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text)); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + dtED.Text = f.dtPick.SelectionStart.ToShortDateString(); + } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + var oldlist = (List)tbProcess.Tag; + var f = new JobReport_.fSelectProcess(oldlist.ToArray()); + if (f.ShowDialog() == DialogResult.OK) + { + tbProcess.Tag = f.values; + tbProcess.Text = string.Join(",", f.values); + UpdateUserList(); + } + + } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + var f = new JobReport_.rK5Dailyform(); + f.Show(); + } + + private void arDatagridView1_DataError(object sender, DataGridViewDataErrorEventArgs e) + { + + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + //전체승인 + var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?"); + if (dlg != DialogResult.Yes) return; + + foreach (dsPRJ.JobReportRow dr in this.dsMSSQL.JobReport) + { + if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue; + if(dr.ot2 == 0) dr.ot2 = dr.ot; + dr.EndEdit(); + } + + util.MsgI("모든 시간을 적용 했습니다. 적용하려면 '저장' 버튼을 누르세요"); + //funcDelete(); + } + } +} diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx new file mode 100644 index 0000000..4dd088e --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 259, 17 + + + 122, 17 + + + 17, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3Kv+EsF70UohSyqjIF6WpTQ3s + Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc1tzm04I9NMbc45L+BlqbucoztnfnvO2VIDoR98eF48 + 5/vh/L7nCLgJu6dMvlihU0RX6n6HS3UUOWmeKu7U09EVWjrysWY0SKKuORzzZh8f2j0RD/vVSzZ6Zcxo + Zq2ODVjtO6zYOGj8XLCh+KMF8ZXjTmGO3Mcb9UxUmWZp0mRhtWYX9DMM9BYGOjMDzfQmlL820DnmwAYD + tI1TKH4/g7Sno9Q/knBpJ7Xu3MTQLIuvsww5GQzykk2ojBv4POYkAjeGFljo510olVsQcrf3NR+Oqwo2 + XZfGbInrryKt7hrquppR0lKFEKk/ggnC0jMIk51EdVs1v4qdZrC46kSYWMXwgtiKkHe9I+1on3yBOl0h + L0mqjUThq0TkNsdD1HAJqQ2paBteRPuoHZ++r2ON9BQu66d5gbBG6BMkzWN1E314OSJDuTKHlyTXR5Hw + ZWQ+y4Da6OBX6ZmkoCA9rDpcCC8Z8Ai4iShT0fmNKTAYNWjQ38Gj7gLEVZ1Hcm0MDGYnDKRYrmD1lKcT + KxGEyXYJzt6Xuk4VHUJijRBDU1qU9mVBJs9H/JNQNCs/4NscAwMpVjvtwgBhyeZCyAOv4LjEVxwoOYjc + pgTcqI9AQvUFXpIvT4SkJYO8SSi4+yELi0HuExNspMiAPI1HECjZPxcoOUAe8kVgoS+ulIci+3kK1GMK + lCqKkPU2BaL6WBiIQE/+DR0R0C43ESh3VjiX108vrNEYnmN5VBPzuN2YiXQSFDfEo6Dp1vYdh3OTJYLW + HQFnm7XuCP6Hg1shY5fgdP4Xp3Zkamuvh/fCPDvvPprUZvfGSZGZ3aaZdadNOzrtNi1TMC1RMHpZtrt4 + uObtNAujec5NUdSa382OH964QHAisys7QNTZfUyssAaIW+lt0j34/0XUSvuJOlaPpHb0+KfI0wQCgeAP + 5eegBTzkqG4AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6 + VqHgsNxeMA03YN3lp/9vv4YYhAtsuQ6h55/9A8aBidVgPtiADZcegzWDFN1/9///qy8IDOKDcPfu1/9/ + /vn/v3rt/f9TD38BuwJuwIrT9wka0L79BdiAkuW3MA0A+fnog///V12GKAZ5BxcGGQByDYoXYAbA/Aey + AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs + 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG + GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 186, 17 + + + 499, 17 + + + 393, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei + QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG + A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF + GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG + cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E + dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC + + + + True + + \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs new file mode 100644 index 0000000..1116b40 --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.Designer.cs @@ -0,0 +1,133 @@ + +namespace FPJ0000.OtConfirm +{ + partial class fOTConfirmValue + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.radAll = new System.Windows.Forms.RadioButton(); + this.radInput = new System.Windows.Forms.RadioButton(); + this.tbRemark = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.nudValue = new System.Windows.Forms.NumericUpDown(); + this.btOK = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.nudValue)).BeginInit(); + this.SuspendLayout(); + // + // radAll + // + this.radAll.AutoSize = true; + this.radAll.Checked = true; + this.radAll.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radAll.Location = new System.Drawing.Point(21, 21); + this.radAll.Name = "radAll"; + this.radAll.Size = new System.Drawing.Size(164, 22); + this.radAll.TabIndex = 0; + this.radAll.TabStop = true; + this.radAll.Text = "입력값 전체 승인"; + this.radAll.UseVisualStyleBackColor = true; + // + // radInput + // + this.radInput.AutoSize = true; + this.radInput.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radInput.Location = new System.Drawing.Point(21, 58); + this.radInput.Name = "radInput"; + this.radInput.Size = new System.Drawing.Size(128, 22); + this.radInput.TabIndex = 0; + this.radInput.Text = "승인 값 입력"; + this.radInput.UseVisualStyleBackColor = true; + this.radInput.CheckedChanged += new System.EventHandler(this.radInput_CheckedChanged); + // + // tbRemark + // + this.tbRemark.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbRemark.Location = new System.Drawing.Point(22, 96); + this.tbRemark.Name = "tbRemark"; + this.tbRemark.Size = new System.Drawing.Size(498, 27); + this.tbRemark.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.Location = new System.Drawing.Point(474, 72); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 18); + this.label1.TabIndex = 2; + this.label1.Text = "비고"; + // + // nudValue + // + this.nudValue.Enabled = false; + this.nudValue.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.nudValue.Location = new System.Drawing.Point(155, 54); + this.nudValue.Name = "nudValue"; + this.nudValue.Size = new System.Drawing.Size(140, 30); + this.nudValue.TabIndex = 3; + this.nudValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // btOK + // + this.btOK.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btOK.Location = new System.Drawing.Point(21, 139); + this.btOK.Name = "btOK"; + this.btOK.Size = new System.Drawing.Size(499, 49); + this.btOK.TabIndex = 4; + this.btOK.Text = "확인"; + this.btOK.UseVisualStyleBackColor = true; + this.btOK.Click += new System.EventHandler(this.btOK_Click); + // + // fOTConfirmValue + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(540, 201); + this.Controls.Add(this.btOK); + this.Controls.Add(this.nudValue); + this.Controls.Add(this.label1); + this.Controls.Add(this.tbRemark); + this.Controls.Add(this.radInput); + this.Controls.Add(this.radAll); + this.Name = "fOTConfirmValue"; + this.Text = "fOTConfirmValue"; + this.Load += new System.EventHandler(this.fOTConfirmValue_Load); + ((System.ComponentModel.ISupportInitialize)(this.nudValue)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton radAll; + private System.Windows.Forms.RadioButton radInput; + private System.Windows.Forms.TextBox tbRemark; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown nudValue; + private System.Windows.Forms.Button btOK; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs new file mode 100644 index 0000000..9f2bcbc --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FPJ0000.OtConfirm +{ + public partial class fOTConfirmValue : Form + { + public fOTConfirmValue() + { + InitializeComponent(); + } + + private void fOTConfirmValue_Load(object sender, EventArgs e) + { + + } + + private void btOK_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.OK; + } + + private void radInput_CheckedChanged(object sender, EventArgs e) + { + nudValue.Enabled = radInput.Checked; + } + } +} diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmValue.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index 33885bd..a8193f3 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -856,7 +856,7 @@ // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton1.ForeColor = System.Drawing.Color.Black; - this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.find; + this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.accept; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(79, 24); diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index b4c4847..8731897 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -1132,7 +1132,7 @@ // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton1.ForeColor = System.Drawing.Color.Black; - this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.find; + this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.accept; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(79, 24); diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index c1fb6fb..8bab925 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -401,7 +401,7 @@ // btFind // this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = global::FPJ0000.Properties.Resources.find; + this.btFind.Image = global::FPJ0000.Properties.Resources.accept; this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; this.btFind.Name = "btFind"; this.btFind.Size = new System.Drawing.Size(23, 22); diff --git a/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs b/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs index c6f3c04..3bbbec3 100644 --- a/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectSummary.Designer.cs @@ -376,7 +376,7 @@ // btFind // this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = global::FPJ0000.Properties.Resources.find; + this.btFind.Image = global::FPJ0000.Properties.Resources.accept; this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; this.btFind.Name = "btFind"; this.btFind.Size = new System.Drawing.Size(23, 22); diff --git a/SubProject/FPJ0000/Properties/Resources.Designer.cs b/SubProject/FPJ0000/Properties/Resources.Designer.cs index ba99e19..40ccccb 100644 --- a/SubProject/FPJ0000/Properties/Resources.Designer.cs +++ b/SubProject/FPJ0000/Properties/Resources.Designer.cs @@ -99,15 +99,5 @@ namespace FPJ0000.Properties { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다. - /// - internal static System.Drawing.Bitmap find { - get { - object obj = ResourceManager.GetObject("find", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/SubProject/FPJ0000/Properties/Resources.resx b/SubProject/FPJ0000/Properties/Resources.resx index 65f2417..0fbdf66 100644 --- a/SubProject/FPJ0000/Properties/Resources.resx +++ b/SubProject/FPJ0000/Properties/Resources.resx @@ -124,9 +124,6 @@ ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\action_save.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs index 3feaaa7..e415ed1 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs @@ -312,7 +312,7 @@ // btFind // this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btFind.Image = global::FPJ0000.Properties.Resources.find; + this.btFind.Image = global::FPJ0000.Properties.Resources.accept; this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; this.btFind.Name = "btFind"; this.btFind.Size = new System.Drawing.Size(23, 22); diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 2825325..842c610 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -3623,6 +3623,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnkisulamt; + private global::System.Data.DataColumn columnot2; + + private global::System.Data.DataColumn columnotReason; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public JobReportDataTable() { @@ -3896,6 +3900,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn ot2Column { + get { + return this.columnot2; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn otReasonColumn { + get { + return this.columnotReason; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3962,7 +3982,9 @@ namespace FPJ0000 { bool autoinput, string kisullv, string kisuldiv, - decimal kisulamt) { + decimal kisulamt, + double ot2, + string otReason) { JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3994,7 +4016,9 @@ namespace FPJ0000 { autoinput, kisullv, kisuldiv, - kisulamt}; + kisulamt, + ot2, + otReason}; rowJobReportRow.ItemArray = columnValuesArray; this.Rows.Add(rowJobReportRow); return rowJobReportRow; @@ -4054,6 +4078,8 @@ namespace FPJ0000 { this.columnkisullv = base.Columns["kisullv"]; this.columnkisuldiv = base.Columns["kisuldiv"]; this.columnkisulamt = base.Columns["kisulamt"]; + this.columnot2 = base.Columns["ot2"]; + this.columnotReason = base.Columns["otReason"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4119,6 +4145,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnkisuldiv); this.columnkisulamt = new global::System.Data.DataColumn("kisulamt", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnkisulamt); + this.columnot2 = new global::System.Data.DataColumn("ot2", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnot2); + this.columnotReason = new global::System.Data.DataColumn("otReason", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnotReason); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -4152,6 +4182,7 @@ namespace FPJ0000 { this.columnsvalue.MaxLength = 255; this.columnkisullv.MaxLength = 10; this.columnkisuldiv.MaxLength = 100; + this.columnotReason.MaxLength = 255; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14099,6 +14130,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double ot2 { + get { + if (this.Isot2Null()) { + return 0D; + } + else { + return ((double)(this[this.tableJobReport.ot2Column])); + } + } + set { + this[this.tableJobReport.ot2Column] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string otReason { + get { + if (this.IsotReasonNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobReport.otReasonColumn])); + } + } + set { + this[this.tableJobReport.otReasonColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -14410,6 +14473,30 @@ namespace FPJ0000 { public void SetkisulamtNull() { this[this.tableJobReport.kisulamtColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool Isot2Null() { + return this.IsNull(this.tableJobReport.ot2Column); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void Setot2Null() { + this[this.tableJobReport.ot2Column] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsotReasonNull() { + return this.IsNull(this.tableJobReport.otReasonColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetotReasonNull() { + this[this.tableJobReport.otReasonColumn] = global::System.Convert.DBNull; + } } /// @@ -25159,73 +25246,20 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; tableMapping.ColumnMappings.Add("kisullv", "kisullv"); tableMapping.ColumnMappings.Add("kisuldiv", "kisuldiv"); tableMapping.ColumnMappings.Add("kisulamt", "kisulamt"); + tableMapping.ColumnMappings.Add("ot2", "ot2"); + tableMapping.ColumnMappings.Add("otReason", "otReason"); 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 [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND" + - " [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdat" + - "e] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS N" + - "ULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart]" + - " IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 " + - "AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status " + - "= 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type =" + - " 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AN" + - "D [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND " + - "[hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import]" + - " IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([" + - "wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NUL" + - "L) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS " + - "NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL)" + - " OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNu" + - "ll_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart " + - "= 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otE" + - "nd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoin" + - "put = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM JobReport\r\nWHERE (idx = @Original_idx)"; 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_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_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", 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 JobReport (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, kisullv, - kisuldiv, kisulamt) -VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt); + kisuldiv, kisulamt, ot2, otReason) +VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt,@ot2,@otReason); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.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, "", "", "")); @@ -25253,13 +25287,15 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", 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 JobReport SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, gcode = @gcode, description2 = @description2, tag = @tag, - otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt -WHERE (idx = @Original_idx); + otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason +WHERE (idx = @Original_idx); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.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, "", "", "")); @@ -25287,6 +25323,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", 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, 4, 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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -25305,7 +25343,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -25334,7 +25372,7 @@ ORDER BY pdate DESC"; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) - AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt + AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC"; @@ -25346,7 +25384,7 @@ ORDER BY pdate DESC"; this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; this._commandCollection[4].CommandText = @"SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC"; @@ -25665,178 +25703,8 @@ ORDER BY projectName"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete( - int Original_idx, - global::System.Nullable Original_pidx, - string Original_pdate, - string Original_uid, - string Original_requestpart, - string Original_package, - string Original_status, - string Original_type, - string Original_remark, - global::System.Nullable Original_hrs, - global::System.Nullable Original_import, - string Original_wuid, - System.DateTime Original_wdate, - string Original_projectName, - global::System.Nullable Original_ot, - string Original_process, - string Original_gcode, - string Original_tag, - global::System.Nullable Original_otStart, - global::System.Nullable Original_otEnd, - global::System.Nullable Original_autoinput) { + public virtual int Delete(int Original_idx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_pidx.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((int)(Original_pidx.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; - } - if ((Original_pdate == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_pdate)); - } - if ((Original_uid == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_uid)); - } - if ((Original_requestpart == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_requestpart)); - } - if ((Original_package == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_package)); - } - if ((Original_status == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_status)); - } - if ((Original_type == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_type)); - } - if ((Original_remark == null)) { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_remark)); - } - if ((Original_hrs.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((double)(Original_hrs.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; - } - if ((Original_import.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[20].Value = ((bool)(Original_import.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[21].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[22].Value = ((System.DateTime)(Original_wdate)); - if ((Original_projectName == null)) { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_projectName)); - } - if ((Original_ot.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[26].Value = ((double)(Original_ot.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; - } - if ((Original_process == null)) { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_process)); - } - if ((Original_gcode == null)) { - throw new global::System.ArgumentNullException("Original_gcode"); - } - else { - this.Adapter.DeleteCommand.Parameters[29].Value = ((string)(Original_gcode)); - } - if ((Original_tag == null)) { - this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[31].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[31].Value = ((string)(Original_tag)); - } - if ((Original_otStart.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[33].Value = ((System.DateTime)(Original_otStart.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[33].Value = global::System.DBNull.Value; - } - if ((Original_otEnd.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[35].Value = ((System.DateTime)(Original_otEnd.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[35].Value = global::System.DBNull.Value; - } - if ((Original_autoinput.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[37].Value = ((bool)(Original_autoinput.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[37].Value = global::System.DBNull.Value; - } 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)) { @@ -25882,7 +25750,9 @@ ORDER BY projectName"; global::System.Nullable autoinput, string kisullv, string kisuldiv, - global::System.Nullable kisulamt) { + global::System.Nullable kisulamt, + global::System.Nullable ot2, + string otReason) { if ((pidx.HasValue == true)) { this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value)); } @@ -26028,6 +25898,18 @@ ORDER BY projectName"; else { this.Adapter.InsertCommand.Parameters[24].Value = global::System.DBNull.Value; } + if ((ot2.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[25].Value = ((double)(ot2.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((otReason == null)) { + this.Adapter.InsertCommand.Parameters[26].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[26].Value = ((string)(otReason)); + } 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)) { @@ -26074,6 +25956,8 @@ ORDER BY projectName"; string kisullv, string kisuldiv, global::System.Nullable kisulamt, + global::System.Nullable ot2, + string otReason, int Original_idx, int idx) { if ((pidx.HasValue == true)) { @@ -26221,8 +26105,20 @@ ORDER BY projectName"; else { this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(idx)); + if ((ot2.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[25].Value = ((double)(ot2.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; + } + if ((otReason == null)) { + this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(otReason)); + } + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[28].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)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 1b46b38..bad38f1 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -776,47 +776,11 @@ WHERE (Project = @pidx) - - DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput))) + + DELETE FROM JobReport +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -824,8 +788,8 @@ WHERE (Project = @pidx) INSERT INTO JobReport (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, kisullv, - kisuldiv, kisulamt) -VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt); + kisuldiv, kisulamt, ot2, otReason) +VALUES (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt,@ot2,@otReason); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC @@ -853,13 +817,15 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r + + SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, - process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt + process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) ORDER BY pdate DESC @@ -876,8 +842,8 @@ ORDER BY pdate DESC UPDATE JobReport SET pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, gcode = @gcode, description2 = @description2, tag = @tag, - otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt -WHERE (idx = @Original_idx); + otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason +WHERE (idx = @Original_idx); SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC @@ -905,6 +871,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r + + @@ -942,6 +910,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r + + @@ -985,7 +955,7 @@ WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(import, 0) = 1) AND (gcode = @gc SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) - AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt + AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww, kisullv, kisuldiv, kisulamt, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC @@ -1002,7 +972,7 @@ ORDER BY pdate DESC SELECT description, hrs, idx, import, ot, package, pdate, pidx, process, projectName, remark, requestpart, status, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) - AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput + AS ww, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, kisullv, kisuldiv, kisulamt, autoinput, ot2, otReason FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(dbo.getProjectName(pidx), '') LIKE @prjname) AND (gcode = @gcode) ORDER BY pdate DESC @@ -3450,6 +3420,14 @@ WHERE (idx = @idx) + + + + + + + + @@ -4017,7 +3995,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 950d961..698b6d4 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,23 +4,23 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - +