From e10610f15f45cf69e9aa63f43b7f11a35d2b6eb1 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 9 Feb 2023 13:38:26 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=80=ED=86=A0=EA=B8=B0=ED=95=9C=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80=20,=20=EA=B0=9C?= =?UTF-8?q?=EC=9D=B8=EB=B3=84=20=EC=8A=A4=EC=BC=80=EC=A5=B4=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- .../JobReport_/rJobReportPrjSche.Designer.cs | 275 +++---- .../FPJ0000/JobReport_/rJobReportPrjSche.cs | 255 +++--- .../FPJ0000/Project/fProjectData.Designer.cs | 76 +- SubProject/FPJ0000/Project/fProjectData.resx | 3 + .../FPJ0000/Project/fProjectList.Designer.cs | 753 +++++++++++------- SubProject/FPJ0000/Project/fProjectList.cs | 6 +- SubProject/FPJ0000/Project/fProjectList.resx | 20 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 159 ++-- SubProject/FPJ0000/dsPRJ.xsd | 60 +- SubProject/FPJ0000/dsReport.Designer.cs | 96 ++- SubProject/FPJ0000/dsReport.xsd | 18 +- 12 files changed, 1105 insertions(+), 620 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index cd5f551..fd25104 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.02.02.2000")] -[assembly: AssemblyFileVersion("23.02.02.2000")] +[assembly: AssemblyVersion("23.02.09.1300")] +[assembly: AssemblyFileVersion("23.02.09.1300")] diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs index ba4d46d..218cd42 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs @@ -30,25 +30,25 @@ { this.components = new System.ComponentModel.Container(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); 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 textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -59,7 +59,9 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); this.panel1 = new System.Windows.Forms.Panel(); + this.tbWW = new System.Windows.Forms.TextBox(); this.btSave = new System.Windows.Forms.Button(); this.cmbUser = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); @@ -71,7 +73,6 @@ this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter(); this.fp1 = new FarPoint.Win.Spread.FpSpread(); this.fp1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.tbWW = new System.Windows.Forms.TextBox(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); @@ -96,6 +97,15 @@ this.panel1.Size = new System.Drawing.Size(1114, 58); this.panel1.TabIndex = 7; // + // tbWW + // + this.tbWW.Location = new System.Drawing.Point(243, 9); + this.tbWW.Name = "tbWW"; + this.tbWW.ReadOnly = true; + this.tbWW.Size = new System.Drawing.Size(62, 21); + this.tbWW.TabIndex = 13; + this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // btSave // this.btSave.Dock = System.Windows.Forms.DockStyle.Right; @@ -193,31 +203,32 @@ this.fp1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fp1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fp1_Sheet1.ColumnCount = 30; + this.fp1_Sheet1.ColumnCount = 31; this.fp1_Sheet1.ActiveColumnIndex = -1; this.fp1_Sheet1.ActiveRowIndex = -1; this.fp1_Sheet1.AutoGenerateColumns = false; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 6; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "담당자"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 2).ColumnSpan = 8; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Basic Info"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Process /\r\nEquipment"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 10).ColumnSpan = 6; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 15).ColumnSpan = 4; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Original\r\n($K)"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " "; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Input\r\n($K)"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Effect\r\n($K)"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Budget"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 20).ColumnSpan = 5; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Human Resource"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Schedule"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 5; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 26).ColumnSpan = 2; this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 3; - this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Comment"; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 28).ColumnSpan = 3; + this.fp1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "Ext.Info"; this.fp1_Sheet1.ColumnHeader.Rows.Get(0).Height = 29F; this.fp1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType1.DecimalPlaces = 0; @@ -232,186 +243,182 @@ this.fp1_Sheet1.Columns.Get(0).Locked = true; this.fp1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fp1_Sheet1.Columns.Get(0).Width = 28F; + this.fp1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fp1_Sheet1.Columns.Get(1).DataField = "uname"; + this.fp1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(1).Label = "담당자"; + this.fp1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; numberCellType2.DecimalPlaces = 0; numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType2.MaximumValue = 2147483647D; numberCellType2.MinimumValue = -2147483648D; - this.fp1_Sheet1.Columns.Get(1).CellType = numberCellType2; - this.fp1_Sheet1.Columns.Get(1).DataField = "pno"; - this.fp1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(1).Label = "Basic Info"; - this.fp1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(1).Width = 36F; - this.fp1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fp1_Sheet1.Columns.Get(2).CellType = textCellType1; - this.fp1_Sheet1.Columns.Get(2).DataField = "process"; - this.fp1_Sheet1.Columns.Get(2).Label = "Process /\r\nEquipment"; - this.fp1_Sheet1.Columns.Get(2).Width = 83F; + this.fp1_Sheet1.Columns.Get(2).CellType = numberCellType2; + this.fp1_Sheet1.Columns.Get(2).DataField = "pno"; + this.fp1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(2).Label = "Basic Info"; + this.fp1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(2).Width = 36F; + this.fp1_Sheet1.Columns.Get(3).AllowAutoFilter = true; this.fp1_Sheet1.Columns.Get(3).CellType = textCellType2; - this.fp1_Sheet1.Columns.Get(3).DataField = "ReqSite"; - this.fp1_Sheet1.Columns.Get(3).Width = 18F; + this.fp1_Sheet1.Columns.Get(3).DataField = "process"; + this.fp1_Sheet1.Columns.Get(3).Label = "Process /\r\nEquipment"; + this.fp1_Sheet1.Columns.Get(3).Width = 83F; this.fp1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fp1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; - this.fp1_Sheet1.Columns.Get(4).Width = 15F; + this.fp1_Sheet1.Columns.Get(4).DataField = "ReqSite"; + this.fp1_Sheet1.Columns.Get(4).Width = 18F; this.fp1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fp1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; + this.fp1_Sheet1.Columns.Get(5).DataField = "ReqPlant"; this.fp1_Sheet1.Columns.Get(5).Width = 15F; this.fp1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fp1_Sheet1.Columns.Get(6).DataField = "ReqLine"; - this.fp1_Sheet1.Columns.Get(6).Width = 17F; + this.fp1_Sheet1.Columns.Get(6).DataField = "ReqPackage"; + this.fp1_Sheet1.Columns.Get(6).Width = 15F; this.fp1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fp1_Sheet1.Columns.Get(7).DataField = "part"; - this.fp1_Sheet1.Columns.Get(7).Width = 18F; + this.fp1_Sheet1.Columns.Get(7).DataField = "ReqLine"; + this.fp1_Sheet1.Columns.Get(7).Width = 17F; this.fp1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fp1_Sheet1.Columns.Get(8).DataField = "name"; - this.fp1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fp1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(8).Width = 12F; + this.fp1_Sheet1.Columns.Get(8).DataField = "part"; + this.fp1_Sheet1.Columns.Get(8).Width = 18F; + this.fp1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fp1_Sheet1.Columns.Get(9).DataField = "name"; + this.fp1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fp1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(9).Width = 12F; numberCellType3.DecimalPlaces = 0; numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType3.MaximumValue = 2147483647D; numberCellType3.MinimumValue = -2147483648D; - this.fp1_Sheet1.Columns.Get(9).CellType = numberCellType3; - this.fp1_Sheet1.Columns.Get(9).DataField = "finishrate"; - this.fp1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(9).Label = "Schedule"; - this.fp1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(9).Width = 58F; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fp1_Sheet1.Columns.Get(10).CellType = numberCellType4; - this.fp1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; + this.fp1_Sheet1.Columns.Get(10).CellType = numberCellType3; + this.fp1_Sheet1.Columns.Get(10).DataField = "finishrate"; this.fp1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(10).Label = "Schedule"; this.fp1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fp1_Sheet1.Columns.Get(10).Width = 58F; - this.fp1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fp1_Sheet1.Columns.Get(11).DataField = "status"; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fp1_Sheet1.Columns.Get(11).CellType = numberCellType4; + this.fp1_Sheet1.Columns.Get(11).DataField = "ProgressPrj"; this.fp1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(11).Tag = "Status"; + this.fp1_Sheet1.Columns.Get(11).Label = "Schedule"; this.fp1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(11).Width = 15F; + this.fp1_Sheet1.Columns.Get(11).Width = 58F; this.fp1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fp1_Sheet1.Columns.Get(12).DataField = "sdate"; + this.fp1_Sheet1.Columns.Get(12).DataField = "status"; this.fp1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(12).Tag = "Status"; this.fp1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(12).Width = 20F; + this.fp1_Sheet1.Columns.Get(12).Width = 15F; this.fp1_Sheet1.Columns.Get(13).CellType = textCellType10; - this.fp1_Sheet1.Columns.Get(13).DataField = "ddate"; + this.fp1_Sheet1.Columns.Get(13).DataField = "sdate"; this.fp1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(13).Width = 18F; + this.fp1_Sheet1.Columns.Get(13).Width = 20F; this.fp1_Sheet1.Columns.Get(14).CellType = textCellType11; - this.fp1_Sheet1.Columns.Get(14).DataField = "edate"; + this.fp1_Sheet1.Columns.Get(14).DataField = "ddate"; this.fp1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fp1_Sheet1.Columns.Get(14).Width = 18F; + this.fp1_Sheet1.Columns.Get(15).CellType = textCellType12; + this.fp1_Sheet1.Columns.Get(15).DataField = "edate"; + this.fp1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(15).Width = 18F; numberCellType5.DecimalPlaces = 0; numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; numberCellType5.MaximumValue = 2147483647D; numberCellType5.MinimumValue = -2147483648D; - this.fp1_Sheet1.Columns.Get(15).CellType = numberCellType5; - this.fp1_Sheet1.Columns.Get(15).DataField = "cnt"; - this.fp1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(15).Label = "Effect"; - this.fp1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(15).Width = 39F; + this.fp1_Sheet1.Columns.Get(16).CellType = numberCellType5; + this.fp1_Sheet1.Columns.Get(16).DataField = "cnt"; + this.fp1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(16).Label = "Effect"; + this.fp1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(16).Width = 39F; numberCellType6.MaximumValue = 999999999999999D; numberCellType6.MinimumValue = -999999999999999D; - this.fp1_Sheet1.Columns.Get(16).CellType = numberCellType6; - this.fp1_Sheet1.Columns.Get(16).DataField = "costo"; - this.fp1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(16).Label = "Original\r\n($K)"; - this.fp1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(16).Width = 51F; + this.fp1_Sheet1.Columns.Get(17).CellType = numberCellType6; + this.fp1_Sheet1.Columns.Get(17).DataField = "costo"; + this.fp1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(17).Label = "Original\r\n($K)"; + this.fp1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(17).Width = 51F; numberCellType7.MaximumValue = 999999999999999D; numberCellType7.MinimumValue = -999999999999999D; - this.fp1_Sheet1.Columns.Get(17).CellType = numberCellType7; - this.fp1_Sheet1.Columns.Get(17).DataField = "costn"; - this.fp1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(17).Label = "Input\r\n($K)"; - this.fp1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(17).Width = 37F; - this.fp1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fp1_Sheet1.Columns.Get(18).CellType = numberCellType7; + this.fp1_Sheet1.Columns.Get(18).DataField = "costn"; + this.fp1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(18).Label = "Input\r\n($K)"; + this.fp1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(18).Width = 37F; + this.fp1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType8.MaximumValue = 999999999999999D; numberCellType8.MinimumValue = -999999999999999D; - this.fp1_Sheet1.Columns.Get(18).CellType = numberCellType8; - this.fp1_Sheet1.Columns.Get(18).DataField = "coste"; - this.fp1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fp1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(18).Label = "Effect\r\n($K)"; - this.fp1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(18).Width = 39F; - this.fp1_Sheet1.Columns.Get(19).CellType = textCellType12; - this.fp1_Sheet1.Columns.Get(19).DataField = "orderno"; - this.fp1_Sheet1.Columns.Get(19).Label = "Budget"; - this.fp1_Sheet1.Columns.Get(19).Width = 47F; + this.fp1_Sheet1.Columns.Get(19).CellType = numberCellType8; + this.fp1_Sheet1.Columns.Get(19).DataField = "coste"; + this.fp1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fp1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(19).Label = "Effect\r\n($K)"; + this.fp1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(19).Width = 39F; this.fp1_Sheet1.Columns.Get(20).CellType = textCellType13; - this.fp1_Sheet1.Columns.Get(20).DataField = "name_software"; - this.fp1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(20).Label = "Human Resource"; - this.fp1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(20).Width = 57F; + this.fp1_Sheet1.Columns.Get(20).DataField = "orderno"; + this.fp1_Sheet1.Columns.Get(20).Label = "Budget"; + this.fp1_Sheet1.Columns.Get(20).Width = 47F; this.fp1_Sheet1.Columns.Get(21).CellType = textCellType14; - this.fp1_Sheet1.Columns.Get(21).DataField = "name_design"; + this.fp1_Sheet1.Columns.Get(21).DataField = "name_software"; this.fp1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(21).Label = "Human Resource"; this.fp1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(21).Width = 17F; + this.fp1_Sheet1.Columns.Get(21).Width = 57F; this.fp1_Sheet1.Columns.Get(22).CellType = textCellType15; - this.fp1_Sheet1.Columns.Get(22).DataField = "name_assembly"; + this.fp1_Sheet1.Columns.Get(22).DataField = "name_design"; this.fp1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(22).Width = 20F; + this.fp1_Sheet1.Columns.Get(22).Width = 17F; this.fp1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fp1_Sheet1.Columns.Get(23).DataField = "name_epanel"; + this.fp1_Sheet1.Columns.Get(23).DataField = "name_assembly"; this.fp1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(23).Width = 16F; + this.fp1_Sheet1.Columns.Get(23).Width = 20F; this.fp1_Sheet1.Columns.Get(24).CellType = textCellType17; - this.fp1_Sheet1.Columns.Get(24).DataField = "name_champion"; + this.fp1_Sheet1.Columns.Get(24).DataField = "name_epanel"; this.fp1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fp1_Sheet1.Columns.Get(24).Width = 16F; this.fp1_Sheet1.Columns.Get(25).CellType = textCellType18; - this.fp1_Sheet1.Columns.Get(25).DataField = "lasthistory"; - this.fp1_Sheet1.Columns.Get(25).Label = "Comment"; - this.fp1_Sheet1.Columns.Get(25).Width = 59F; + this.fp1_Sheet1.Columns.Get(25).DataField = "name_champion"; + this.fp1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(25).Width = 16F; this.fp1_Sheet1.Columns.Get(26).CellType = textCellType19; - this.fp1_Sheet1.Columns.Get(26).DataField = "memo"; + this.fp1_Sheet1.Columns.Get(26).DataField = "lasthistory"; this.fp1_Sheet1.Columns.Get(26).Label = "Comment"; - this.fp1_Sheet1.Columns.Get(26).Width = 63F; + this.fp1_Sheet1.Columns.Get(26).Width = 59F; this.fp1_Sheet1.Columns.Get(27).CellType = textCellType20; - this.fp1_Sheet1.Columns.Get(27).DataField = "asset"; - this.fp1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fp1_Sheet1.Columns.Get(27).Label = "Ext.Info"; - this.fp1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(27).Width = 49F; + this.fp1_Sheet1.Columns.Get(27).DataField = "memo"; + this.fp1_Sheet1.Columns.Get(27).Label = "Comment"; + this.fp1_Sheet1.Columns.Get(27).Width = 63F; this.fp1_Sheet1.Columns.Get(28).CellType = textCellType21; - this.fp1_Sheet1.Columns.Get(28).DataField = "model"; + this.fp1_Sheet1.Columns.Get(28).DataField = "asset"; this.fp1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(28).Label = "Ext.Info"; this.fp1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(28).Width = 25F; + this.fp1_Sheet1.Columns.Get(28).Width = 49F; this.fp1_Sheet1.Columns.Get(29).CellType = textCellType22; - this.fp1_Sheet1.Columns.Get(29).DataField = "serial"; + this.fp1_Sheet1.Columns.Get(29).DataField = "model"; this.fp1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fp1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fp1_Sheet1.Columns.Get(29).Width = 26F; + this.fp1_Sheet1.Columns.Get(29).Width = 25F; + this.fp1_Sheet1.Columns.Get(30).CellType = textCellType23; + this.fp1_Sheet1.Columns.Get(30).DataField = "serial"; + this.fp1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fp1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fp1_Sheet1.Columns.Get(30).Width = 26F; this.fp1_Sheet1.DataAutoSizeColumns = false; this.fp1_Sheet1.DataSource = this.bs; this.fp1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fp1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // tbWW - // - this.tbWW.Location = new System.Drawing.Point(243, 9); - this.tbWW.Name = "tbWW"; - this.tbWW.ReadOnly = true; - this.tbWW.Size = new System.Drawing.Size(62, 21); - this.tbWW.TabIndex = 13; - this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // rJobReportPrjSche // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -444,7 +451,7 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btRefresh; private FarPoint.Win.Spread.FpSpread fp1; - private FarPoint.Win.Spread.SheetView fp1_Sheet1; private System.Windows.Forms.TextBox tbWW; + private FarPoint.Win.Spread.SheetView fp1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs index 6350169..3e70569 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs @@ -37,9 +37,9 @@ namespace FPJ0000.JobReport_ foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) tbProcess.Items.Add(dr.processs); - this.tbProcess.Text = FCOMMON.info.Login.process; - if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; - + //this.tbProcess.Text = FCOMMON.info.Login.process; + tbProcess.SelectedIndex = 0; + tbProcess.Enabled = false; //사용자 목록을 선택한다 UpdateUserList(); @@ -51,7 +51,7 @@ namespace FPJ0000.JobReport_ var ta = new dsPRJTableAdapters.vJobReportForUserListTableAdapter(); cmbUser.Items.Clear(); - + cmbUser.Items.Add("--전체--"); ; //일반사용자 목록 가져온다 dsPRJ.vJobReportForUserListDataTable userlist; @@ -75,7 +75,7 @@ namespace FPJ0000.JobReport_ cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name)); } - if (tbProcess.SelectedIndex > 0) + //if (tbProcess.SelectedIndex > 0) cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); if (cmbUser.SelectedIndex < 0 && cmbUser.Items.Count > 0) cmbUser.SelectedIndex = 0; //기본전체로 선택해준다. @@ -93,10 +93,44 @@ namespace FPJ0000.JobReport_ var taH = new dsReportTableAdapters.UserScheduleTableTableAdapter(); var username = cmbUser.Text.Trim(); + var userfilter = "%"; + var uid = string.Empty; + if (cmbUser.SelectedIndex > 0) + { + uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; + userfilter = cmbUser.SelectedIndex == 0 ? "%" : "%" + uid + "%"; + } - var uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; + taH.Fill(this.dsReport.UserScheduleTable, FCOMMON.info.Login.gcode, userfilter); + + //담당자별로 데이터를 쪼개야한다 230209 + var dtnew = new dsReport.UserScheduleTableDataTable(); + foreach (dsReport.UserScheduleTableRow dr in dsReport.UserScheduleTable) + { + var userlist = dr.uid.Replace(",", "/").Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + var namelist = dr.uidname.Replace(",", "/").Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + for (int i = 0; i < userlist.Length; i++) + { + var userid = userlist[i]; + if (uid.isEmpty() == false && uid.Equals(userid) == false) continue; + var usernm = namelist[i]; + //모든 컬럼의 데이터를 쓴다 단 idx는 제외한다 + var newdr = dtnew.NewUserScheduleTableRow(); + newdr.idx = dtnew.Rows.Count; + newdr.uid = userid; + newdr.uidname = usernm; + foreach (DataColumn dc in dtnew.Columns) + { + var colname = dc.ColumnName.ToLower(); + if (colname.Equals("idx")) continue; + if (colname.Equals("uid")) continue; + if (colname.Equals("uidname")) continue; + newdr[colname] = dr[colname]; + } + dtnew.AddUserScheduleTableRow(newdr); + } + } - taH.Fill(this.dsReport.UserScheduleTable, FCOMMON.info.Login.gcode, "%" + uid + "%"); //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; //this.reportViewer1.RefreshReport(); @@ -110,7 +144,9 @@ namespace FPJ0000.JobReport_ var colidx = 0; - fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "*"; + fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "공정"; + fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "담당자"; + fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "상태"; fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "프로젝트"; fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "시작"; fp1.ActiveSheet.Columns.Add(colidx, 1); fp1.ActiveSheet.Columns[colidx++].Label = "만료"; @@ -129,7 +165,7 @@ namespace FPJ0000.JobReport_ List wwlist = new List(); wwlist.Add(curww); int ww = 0; - foreach (dsReport.UserScheduleTableRow dr in dsReport.UserScheduleTable.Rows) + foreach (dsReport.UserScheduleTableRow dr in dtnew) { if (dr.sw.Equals("00-00") == false) { @@ -183,100 +219,129 @@ namespace FPJ0000.JobReport_ colidx += 1; } - //프로젝트별로 데이터를 표시한다. - var grp_list = dsReport.UserScheduleTable.GroupBy(t => t.name).OrderBy(t => t.Key); + //사용자별로 그룹을 먼저 짓는다 var ridx = 0; - - foreach (var grp in grp_list) + var grp_prc = dtnew.GroupBy(t => t.userprocess).OrderBy(t => t.Key); + foreach (var prc in grp_prc) { - var prjname = grp.Key; - var sdate = grp.Max(t => t.sdate); - var ddate = grp.Max(t => t.ddate); - //string[] columns = new string[dv1.ColumnCount]; - - var row = 0; - //columns[row++] = grp.Max(t => t.idx).ToString(); - //columns[row++] = prjname; - //columns[row++] = sdate; - //columns[row++] = ddate; - - - var cidx = 0; - fp1.ActiveSheet.RowCount += 1;//.AddRows(ridx, 1); - - var ctdef = new FarPoint.Win.Spread.CellType.TextCellType(); - ctdef.WordWrap = true; - ctdef.Multiline = true; - - - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = grp.Max(t => t.idx); - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = prjname; - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = sdate; - fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = ddate; - - - - //세부항목데이터를 넣는다 - foreach (var dr in grp) + var grp_user = prc.GroupBy(t => t.uid).OrderBy(t => t.Key); + foreach (var user in grp_user) { - //예측일 - var sw = dr.sw; - if (sw.Equals("00-00")) continue; - var ew = dr.ew; - if (ew.Equals("00-00")) continue; - - var isw = int.Parse(sw.Replace("-", "")); - var iew = int.Parse(ew.Replace("-", "")); - bool first = true; - int startcol = -1; - int endcol = -1; - for (int i = 4; i < fp1.ActiveSheet.ColumnCount; i++) + //프로젝트별로 데이터를 표시한다. + var grp_list = user.GroupBy(t => t.name).OrderBy(t => t.Key); + foreach (var grp in grp_list) { - var col = fp1.ActiveSheet.Columns[i]; - if (col.Tag == null) continue; - var colno = int.Parse(col.Tag.ToString()); - if (colno >= isw && colno <= iew) + var prjname = grp.Key; + var sdate = grp.Max(t => t.sdate); + var ddate = grp.Max(t => t.ddate); + var uname = grp.Max(t => t.uidname); + var status = grp.Max(t => t.status); + //string[] columns = new string[dv1.ColumnCount]; + + var row = 0; + //columns[row++] = grp.Max(t => t.idx).ToString(); + //columns[row++] = prjname; + //columns[row++] = sdate; + //columns[row++] = ddate; + + + var cidx = 0; + fp1.ActiveSheet.RowCount += 1;//.AddRows(ridx, 1); + + var ctdef = new FarPoint.Win.Spread.CellType.TextCellType(); + ctdef.WordWrap = true; + ctdef.Multiline = true; + + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = prc.Key; + + + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = uname; + if (status.Equals("진행")) { - // columns[i] = "O"; - - if (dr.complete || dr.progress > 99) - fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Lime; - else if (dr.progress < 50) - fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Tomato; - else - fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Gold; - - if (first) - { - fp1.ActiveSheet.Cells[ridx, i].Value = dr.title + "\n" + dr.progress.ToString("N0") + "%"; - fp1.ActiveSheet.Cells[ridx, i].Note = dr.title + "\n" + dr.progress.ToString("N0") + "%"; - first = false; - startcol = i; - } - else - { - endcol = i; - } + fp1.ActiveSheet.Cells[ridx, cidx].BackColor = Color.White; + fp1.ActiveSheet.Cells[ridx, cidx+1].BackColor = Color.White; + } + else if (status.Equals("검토")) + { + fp1.ActiveSheet.Cells[ridx, cidx].BackColor = Color.SkyBlue; + fp1.ActiveSheet.Cells[ridx, cidx+1].BackColor = Color.SkyBlue; } - fp1.ActiveSheet.Cells[ridx, i].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - fp1.ActiveSheet.Cells[ridx, i].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - fp1.ActiveSheet.Cells[ridx, i].Font = new Font("맑은 고딕", 7); - fp1.ActiveSheet.Cells[ridx, i].CellType = ctdef; - } - if (startcol != -1 && endcol != -1) - { - fp1.ActiveSheet.AddSpanCell(ridx, startcol, 1, (endcol - startcol + 1)); - // fp1.ActiveSheet.Cells[ridx, startcol].CellType = ctdef; - } + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = status;// grp.Max(t => t.idx); + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = prjname; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = sdate; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = ddate; + + + //세부항목데이터를 넣는다 + foreach (var dr in grp) + { + //예측일 + var sw = dr.sw; + if (sw.Equals("00-00")) continue; + var ew = dr.ew; + if (ew.Equals("00-00")) continue; + + var isw = int.Parse(sw.Replace("-", "")); + var iew = int.Parse(ew.Replace("-", "")); + bool first = true; + int startcol = -1; + int endcol = -1; + for (int i = 4; i < fp1.ActiveSheet.ColumnCount; i++) + { + var col = fp1.ActiveSheet.Columns[i]; + if (col.Tag == null) continue; + var colno = int.Parse(col.Tag.ToString()); + if (colno >= isw && colno <= iew) + { + // columns[i] = "O"; + + if (dr.complete || dr.progress > 99) + fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Lime; + else if (dr.progress < 50) + fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Tomato; + else + fp1.ActiveSheet.Cells[ridx, i].BackColor = Color.Gold; + + if (first) + { + fp1.ActiveSheet.Cells[ridx, i].Value = dr.title + "\n" + dr.progress.ToString("N0") + "%"; + fp1.ActiveSheet.Cells[ridx, i].Note = dr.title + "\n" + dr.progress.ToString("N0") + "%"; + first = false; + startcol = i; + } + else + { + endcol = i; + } + } + + fp1.ActiveSheet.Cells[ridx, i].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + fp1.ActiveSheet.Cells[ridx, i].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + fp1.ActiveSheet.Cells[ridx, i].Font = new Font("맑은 고딕", 7); + fp1.ActiveSheet.Cells[ridx, i].CellType = ctdef; + } + if (startcol != -1 && endcol != -1) + { + fp1.ActiveSheet.AddSpanCell(ridx, startcol, 1, (endcol - startcol + 1)); + // fp1.ActiveSheet.Cells[ridx, startcol].CellType = ctdef; + + } + + } + // dv1.Rows.Add(columns); + ridx += 1; + } } - // dv1.Rows.Add(columns); - ridx += 1; + } + + + fp1.ActiveSheet.AllowNoteEdit = true; fp1.ActiveSheet.AutoUpdateNotes = true; for (int i = 0; i < fp1.ActiveSheet.RowCount; i++) @@ -284,10 +349,12 @@ namespace FPJ0000.JobReport_ fp1.ActiveSheet.Rows[i].Height = 40; } - fp1.ActiveSheet.Columns[0].Width = 35; - fp1.ActiveSheet.Columns[1].Width = 250; - fp1.ActiveSheet.Columns[2].Width = 75; - fp1.ActiveSheet.Columns[3].Width = 75; + fp1.ActiveSheet.Columns[0].Width = 90; + fp1.ActiveSheet.Columns[1].Width = 50; + fp1.ActiveSheet.Columns[2].Width = 35; + fp1.ActiveSheet.Columns[3].Width = 250; + fp1.ActiveSheet.Columns[4].Width = 75; + fp1.ActiveSheet.Columns[5].Width = 75; return; diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 677eb3f..746034e 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -92,6 +92,7 @@ this.btMailAddr = new System.Windows.Forms.ToolStripButton(); this.btPath = new System.Windows.Forms.ToolStripButton(); this.btSendMail = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -136,6 +137,8 @@ this.textBox3 = new System.Windows.Forms.TextBox(); this.arLabel3 = new arCtl.arLabel(); this.panel2 = new System.Windows.Forms.Panel(); + this.linkLabel9 = new System.Windows.Forms.LinkLabel(); + this.textBox11 = new System.Windows.Forms.TextBox(); this.linkLabel8 = new System.Windows.Forms.LinkLabel(); this.textBox9 = new System.Windows.Forms.TextBox(); this.linkLabel7 = new System.Windows.Forms.LinkLabel(); @@ -210,7 +213,6 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); - this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -586,7 +588,7 @@ this.tbSdate.Location = new System.Drawing.Point(69, 28); this.tbSdate.Name = "tbSdate"; this.tbSdate.Size = new System.Drawing.Size(190, 21); - this.tbSdate.TabIndex = 11; + this.tbSdate.TabIndex = 1; // // tbEdate // @@ -684,7 +686,7 @@ this.tbXdate.Location = new System.Drawing.Point(346, 28); this.tbXdate.Name = "tbXdate"; this.tbXdate.Size = new System.Drawing.Size(190, 21); - this.tbXdate.TabIndex = 53; + this.tbXdate.TabIndex = 3; // // assetTextBox // @@ -763,7 +765,6 @@ // 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"; @@ -856,6 +857,15 @@ this.btSendMail.Visible = false; this.btSendMail.Click += new System.EventHandler(this.btSendMail_Click); // + // toolStripButton8 + // + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(63, 22); + this.toolStripButton8.Text = "스케쥴"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; @@ -956,7 +966,7 @@ this.tbODate.Location = new System.Drawing.Point(346, 51); this.tbODate.Name = "tbODate"; this.tbODate.Size = new System.Drawing.Size(190, 21); - this.tbODate.TabIndex = 79; + this.tbODate.TabIndex = 7; // // panel7 // @@ -1468,6 +1478,8 @@ // panel2 // this.panel2.BackColor = System.Drawing.Color.Gainsboro; + this.panel2.Controls.Add(this.linkLabel9); + this.panel2.Controls.Add(this.textBox11); this.panel2.Controls.Add(this.linkLabel8); this.panel2.Controls.Add(this.textBox9); this.panel2.Controls.Add(this.linkLabel7); @@ -1488,13 +1500,34 @@ this.panel2.Size = new System.Drawing.Size(547, 126); this.panel2.TabIndex = 86; // + // linkLabel9 + // + this.linkLabel9.AutoSize = true; + this.linkLabel9.Location = new System.Drawing.Point(289, 104); + this.linkLabel9.Name = "linkLabel9"; + this.linkLabel9.Size = new System.Drawing.Size(53, 12); + this.linkLabel9.TabIndex = 14; + this.linkLabel9.TabStop = true; + this.linkLabel9.Text = "검토기한"; + // + // textBox11 + // + this.textBox11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.textBox11.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "kdate", true)); + this.textBox11.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox11.Location = new System.Drawing.Point(346, 100); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(190, 21); + this.textBox11.TabIndex = 15; + this.textBox11.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // linkLabel8 // this.linkLabel8.AutoSize = true; this.linkLabel8.Location = new System.Drawing.Point(289, 80); this.linkLabel8.Name = "linkLabel8"; this.linkLabel8.Size = new System.Drawing.Size(53, 12); - this.linkLabel8.TabIndex = 96; + this.linkLabel8.TabIndex = 10; this.linkLabel8.TabStop = true; this.linkLabel8.Text = "고객승인"; this.linkLabel8.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel8_LinkClicked); @@ -1506,7 +1539,7 @@ this.textBox9.Location = new System.Drawing.Point(346, 76); this.textBox9.Name = "textBox9"; this.textBox9.Size = new System.Drawing.Size(190, 21); - this.textBox9.TabIndex = 95; + this.textBox9.TabIndex = 11; // // linkLabel7 // @@ -1514,7 +1547,7 @@ this.linkLabel7.Location = new System.Drawing.Point(31, 80); this.linkLabel7.Name = "linkLabel7"; this.linkLabel7.Size = new System.Drawing.Size(31, 12); - this.linkLabel7.TabIndex = 94; + this.linkLabel7.TabIndex = 8; this.linkLabel7.TabStop = true; this.linkLabel7.Text = "Qual"; this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); @@ -1526,7 +1559,7 @@ this.textBox8.Location = new System.Drawing.Point(69, 76); this.textBox8.Name = "textBox8"; this.textBox8.Size = new System.Drawing.Size(190, 21); - this.textBox8.TabIndex = 93; + this.textBox8.TabIndex = 9; // // linkLabel6 // @@ -1534,7 +1567,7 @@ this.linkLabel6.Location = new System.Drawing.Point(14, 56); this.linkLabel6.Name = "linkLabel6"; this.linkLabel6.Size = new System.Drawing.Size(48, 12); - this.linkLabel6.TabIndex = 92; + this.linkLabel6.TabIndex = 4; this.linkLabel6.TabStop = true; this.linkLabel6.Text = "Buy-Off"; this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); @@ -1546,7 +1579,7 @@ this.textBox7.Location = new System.Drawing.Point(69, 52); this.textBox7.Name = "textBox7"; this.textBox7.Size = new System.Drawing.Size(190, 21); - this.textBox7.TabIndex = 91; + this.textBox7.TabIndex = 5; // // linkLabel5 // @@ -1554,7 +1587,7 @@ this.linkLabel5.Location = new System.Drawing.Point(271, 55); this.linkLabel5.Name = "linkLabel5"; this.linkLabel5.Size = new System.Drawing.Size(71, 12); - this.linkLabel5.TabIndex = 90; + this.linkLabel5.TabIndex = 6; this.linkLabel5.TabStop = true; this.linkLabel5.Text = "출고/설치일"; this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); @@ -1565,7 +1598,7 @@ this.linkLabel4.Location = new System.Drawing.Point(21, 104); this.linkLabel4.Name = "linkLabel4"; this.linkLabel4.Size = new System.Drawing.Size(41, 12); - this.linkLabel4.TabIndex = 89; + this.linkLabel4.TabIndex = 12; this.linkLabel4.TabStop = true; this.linkLabel4.Text = "완료일"; this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked); @@ -1576,7 +1609,7 @@ this.linkLabel3.Location = new System.Drawing.Point(301, 32); this.linkLabel3.Name = "linkLabel3"; this.linkLabel3.Size = new System.Drawing.Size(41, 12); - this.linkLabel3.TabIndex = 88; + this.linkLabel3.TabIndex = 2; this.linkLabel3.TabStop = true; this.linkLabel3.Text = "만료일"; this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); @@ -1587,7 +1620,7 @@ this.linkLabel2.Location = new System.Drawing.Point(21, 34); this.linkLabel2.Name = "linkLabel2"; this.linkLabel2.Size = new System.Drawing.Size(41, 12); - this.linkLabel2.TabIndex = 87; + this.linkLabel2.TabIndex = 0; this.linkLabel2.TabStop = true; this.linkLabel2.Text = "시작일"; this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); @@ -1870,7 +1903,6 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; - this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -2453,7 +2485,6 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; - this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -2613,15 +2644,6 @@ // this.taToDo.ClearBeforeFill = true; // - // toolStripButton8 - // - this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); - this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton8.Name = "toolStripButton8"; - this.toolStripButton8.Size = new System.Drawing.Size(63, 22); - this.toolStripButton8.Text = "스케쥴"; - this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); - // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -2841,5 +2863,7 @@ private System.Windows.Forms.ComboBox cmbReqPlant; private System.Windows.Forms.TextBox tbPno; private System.Windows.Forms.ToolStripButton toolStripButton8; + private System.Windows.Forms.LinkLabel linkLabel9; + private System.Windows.Forms.TextBox textBox11; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index c55cf3f..7dbd4b3 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -559,4 +559,7 @@ 1171, 17 + + 77 + \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 8cc8569..42319f5 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -45,11 +45,11 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); 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 textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -60,6 +60,7 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -111,7 +112,6 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -173,13 +173,25 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.label24 = new System.Windows.Forms.Label(); + this.label25 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); @@ -189,6 +201,8 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // bn @@ -281,7 +295,6 @@ // 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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -404,7 +417,6 @@ // 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); @@ -645,253 +657,6 @@ this.fpSpread1.TabIndex = 2; this.fpSpread1.SetViewportLeftColumn(0, 0, 5); // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 30; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 6; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Effect"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Budget"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).ColumnSpan = 5; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Human Resource"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수율(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Progress(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "Start Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Due Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Done Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Q\'ty"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Outsourced Cost ($K)/Set\r\n"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "In-house Cost ($K/Set)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "Cost Save ($k)/Set"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Design"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Assembly"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "ePanel"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "Champion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수율(%)"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Progress(%)"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "Start Date"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ddate"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "Due Date"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Done Date"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "Q\'ty"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 42F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "Outsourced Cost ($K)/Set\r\n"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "In-house Cost ($K/Set)"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Save ($k)/Set"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 67F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "name_software"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_design"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "Design"; - this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_assembly"; - this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "Assembly"; - this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_epanel"; - this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "ePanel"; - this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_champion"; - this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "Champion"; - this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; - this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; - this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; - this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -1015,7 +780,6 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 25); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -1043,12 +807,12 @@ this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1); this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 47); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 69); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1585, 171); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1585, 149); this.tableLayoutPanel1.TabIndex = 11; // // panel4 @@ -1112,7 +876,7 @@ this.richTextBox1.Location = new System.Drawing.Point(3, 28); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(786, 140); + this.richTextBox1.Size = new System.Drawing.Size(786, 118); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // @@ -1124,7 +888,7 @@ this.richTextBox2.Location = new System.Drawing.Point(795, 28); this.richTextBox2.Name = "richTextBox2"; this.richTextBox2.ReadOnly = true; - this.richTextBox2.Size = new System.Drawing.Size(787, 140); + this.richTextBox2.Size = new System.Drawing.Size(787, 118); this.richTextBox2.TabIndex = 1; this.richTextBox2.Text = ""; this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); @@ -1156,13 +920,15 @@ this.tableLayoutPanel2.Controls.Add(this.sbSumO, 3, 1); this.tableLayoutPanel2.Controls.Add(this.sbSumI, 5, 1); this.tableLayoutPanel2.Controls.Add(this.sbSumE, 7, 1); + this.tableLayoutPanel2.Controls.Add(this.panel2, 0, 2); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top; this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowCount = 3; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1585, 47); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1585, 69); this.tableLayoutPanel2.TabIndex = 12; // // label6 @@ -1171,7 +937,7 @@ this.label6.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.Location = new System.Drawing.Point(4, 1); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(74, 24); + this.label6.Size = new System.Drawing.Size(74, 25); this.label6.TabIndex = 0; this.label6.Text = "Start"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1183,7 +949,7 @@ this.label5.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.Location = new System.Drawing.Point(1192, 1); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 24); + this.label5.Size = new System.Drawing.Size(74, 25); this.label5.TabIndex = 0; this.label5.Text = "End(ww)"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1196,7 +962,7 @@ this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.label9.Location = new System.Drawing.Point(400, 1); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(74, 24); + this.label9.Size = new System.Drawing.Size(74, 25); this.label9.TabIndex = 0; this.label9.Text = "Due(ww)"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1209,7 +975,7 @@ this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.label3.Location = new System.Drawing.Point(796, 1); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 24); + this.label3.Size = new System.Drawing.Size(74, 25); this.label3.TabIndex = 0; this.label3.Text = "Out(ww)"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1221,7 +987,7 @@ this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Location = new System.Drawing.Point(85, 1); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(308, 24); + this.label7.Size = new System.Drawing.Size(308, 25); this.label7.TabIndex = 1; this.label7.Text = "--"; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1232,7 +998,7 @@ this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Location = new System.Drawing.Point(481, 1); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(308, 24); + this.label8.Size = new System.Drawing.Size(308, 25); this.label8.TabIndex = 1; this.label8.Text = "--"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1243,7 +1009,7 @@ this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Location = new System.Drawing.Point(877, 1); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(308, 24); + this.label10.Size = new System.Drawing.Size(308, 25); this.label10.TabIndex = 1; this.label10.Text = "--"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1255,7 +1021,7 @@ this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label12.Location = new System.Drawing.Point(1273, 1); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(308, 24); + this.label12.Size = new System.Drawing.Size(308, 25); this.label12.TabIndex = 1; this.label12.Text = "--"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1266,7 +1032,7 @@ this.tableLayoutPanel2.SetColumnSpan(this.label13, 2); this.label13.Dock = System.Windows.Forms.DockStyle.Fill; this.label13.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(1, 26); + this.label13.Location = new System.Drawing.Point(1, 27); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(395, 20); @@ -1279,7 +1045,7 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label14.Dock = System.Windows.Forms.DockStyle.Fill; this.label14.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(397, 26); + this.label14.Location = new System.Drawing.Point(397, 27); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(80, 20); @@ -1292,7 +1058,7 @@ this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(793, 26); + this.label15.Location = new System.Drawing.Point(793, 27); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(80, 20); @@ -1305,7 +1071,7 @@ this.label16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(1189, 26); + this.label16.Location = new System.Drawing.Point(1189, 27); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(80, 20); @@ -1318,7 +1084,7 @@ this.sbSumO.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumO.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumO.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumO.Location = new System.Drawing.Point(478, 26); + this.sbSumO.Location = new System.Drawing.Point(478, 27); this.sbSumO.Margin = new System.Windows.Forms.Padding(0); this.sbSumO.Name = "sbSumO"; this.sbSumO.Size = new System.Drawing.Size(314, 20); @@ -1331,7 +1097,7 @@ this.sbSumI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.sbSumI.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumI.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold); - this.sbSumI.Location = new System.Drawing.Point(874, 26); + this.sbSumI.Location = new System.Drawing.Point(874, 27); this.sbSumI.Margin = new System.Windows.Forms.Padding(0); this.sbSumI.Name = "sbSumI"; this.sbSumI.Size = new System.Drawing.Size(314, 20); @@ -1344,7 +1110,7 @@ this.sbSumE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.sbSumE.Dock = System.Windows.Forms.DockStyle.Fill; this.sbSumE.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.sbSumE.Location = new System.Drawing.Point(1270, 26); + this.sbSumE.Location = new System.Drawing.Point(1270, 27); this.sbSumE.Margin = new System.Windows.Forms.Padding(0); this.sbSumE.Name = "sbSumE"; this.sbSumE.Size = new System.Drawing.Size(314, 20); @@ -1640,6 +1406,428 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 31; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 7; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 5; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 28).Value = "Ext.Info"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수율(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Progress(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "검토\r\n기한"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Start Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Due Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Done Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Q\'ty"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Design"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Assembly"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "Champion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "History"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Memo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Asset"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수율(%)"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Progress(%)"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_software"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_design"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "Design"; + this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_assembly"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "Assembly"; + this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion"; + this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion"; + this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "lasthistory"; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "History"; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "Memo"; + this.fpSpread1_Sheet1.Columns.Get(27).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "Asset"; + this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "Model#"; + this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).Label = "Serial#"; + this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // + // panel2 + // + this.tableLayoutPanel2.SetColumnSpan(this.panel2, 8); + this.panel2.Controls.Add(this.label27); + this.panel2.Controls.Add(this.label26); + this.panel2.Controls.Add(this.label25); + this.panel2.Controls.Add(this.label24); + this.panel2.Controls.Add(this.label23); + this.panel2.Controls.Add(this.label22); + this.panel2.Controls.Add(this.label21); + this.panel2.Controls.Add(this.label20); + this.panel2.Controls.Add(this.label19); + this.panel2.Controls.Add(this.label18); + this.panel2.Controls.Add(this.label28); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(1, 48); + this.panel2.Margin = new System.Windows.Forms.Padding(0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1583, 20); + this.panel2.TabIndex = 2; + // + // label18 + // + this.label18.BackColor = System.Drawing.Color.Silver; + this.label18.Dock = System.Windows.Forms.DockStyle.Left; + this.label18.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label18.ForeColor = System.Drawing.Color.Black; + this.label18.Location = new System.Drawing.Point(78, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(74, 20); + this.label18.TabIndex = 1; + this.label18.Text = "Champion"; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label18, "시작일"); + // + // label19 + // + this.label19.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_champion", true)); + this.label19.Dock = System.Windows.Forms.DockStyle.Left; + this.label19.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label19.Location = new System.Drawing.Point(152, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(120, 20); + this.label19.TabIndex = 2; + this.label19.Text = "(담당자이름)"; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label19, "시작일"); + // + // label20 + // + this.label20.BackColor = System.Drawing.Color.Silver; + this.label20.Dock = System.Windows.Forms.DockStyle.Left; + this.label20.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label20.ForeColor = System.Drawing.Color.Black; + this.label20.Location = new System.Drawing.Point(272, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(74, 20); + this.label20.TabIndex = 3; + this.label20.Text = "Design"; + this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label20, "시작일"); + // + // label21 + // + this.label21.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_design", true)); + this.label21.Dock = System.Windows.Forms.DockStyle.Left; + this.label21.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label21.Location = new System.Drawing.Point(346, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(120, 20); + this.label21.TabIndex = 4; + this.label21.Text = "(담당자이름)"; + this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label21, "시작일"); + // + // label22 + // + this.label22.BackColor = System.Drawing.Color.Silver; + this.label22.Dock = System.Windows.Forms.DockStyle.Left; + this.label22.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label22.ForeColor = System.Drawing.Color.Black; + this.label22.Location = new System.Drawing.Point(466, 0); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(74, 20); + this.label22.TabIndex = 5; + this.label22.Text = "Assembly"; + this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label22, "시작일"); + // + // label23 + // + this.label23.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_assembly", true)); + this.label23.Dock = System.Windows.Forms.DockStyle.Left; + this.label23.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label23.Location = new System.Drawing.Point(540, 0); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(120, 20); + this.label23.TabIndex = 6; + this.label23.Text = "(담당자이름)"; + this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label23, "시작일"); + // + // label24 + // + this.label24.BackColor = System.Drawing.Color.Silver; + this.label24.Dock = System.Windows.Forms.DockStyle.Left; + this.label24.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label24.ForeColor = System.Drawing.Color.Black; + this.label24.Location = new System.Drawing.Point(660, 0); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(74, 20); + this.label24.TabIndex = 7; + this.label24.Text = "ePanel"; + this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label24, "시작일"); + // + // label25 + // + this.label25.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_epanel", true)); + this.label25.Dock = System.Windows.Forms.DockStyle.Left; + this.label25.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label25.Location = new System.Drawing.Point(734, 0); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(120, 20); + this.label25.TabIndex = 8; + this.label25.Text = "(담당자이름)"; + this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label25, "시작일"); + // + // label26 + // + this.label26.BackColor = System.Drawing.Color.Silver; + this.label26.Dock = System.Windows.Forms.DockStyle.Left; + this.label26.Font = new System.Drawing.Font("Cambria", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label26.ForeColor = System.Drawing.Color.Black; + this.label26.Location = new System.Drawing.Point(854, 0); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(74, 20); + this.label26.TabIndex = 9; + this.label26.Text = "S/W"; + this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label26, "시작일"); + // + // label27 + // + this.label27.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name_software", true)); + this.label27.Dock = System.Windows.Forms.DockStyle.Left; + this.label27.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label27.Location = new System.Drawing.Point(928, 0); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(120, 20); + this.label27.TabIndex = 10; + this.label27.Text = "(담당자이름)"; + this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label27, "시작일"); + // + // label28 + // + this.label28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.label28.Dock = System.Windows.Forms.DockStyle.Left; + this.label28.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold); + this.label28.Location = new System.Drawing.Point(0, 0); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(78, 20); + this.label28.TabIndex = 11; + this.label28.Text = "담당자"; + this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.toolTip1.SetToolTip(this.label28, "시작일"); + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1661,7 +1849,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1674,6 +1861,8 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + this.panel2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1794,5 +1983,17 @@ private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripButton toolStripButton5; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label26; + private System.Windows.Forms.Label label25; + private System.Windows.Forms.Label label27; + private System.Windows.Forms.Label label28; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 0569267..e268e3a 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -53,6 +53,7 @@ namespace FPJ0000 "Process", "Asset / 사용자 / 등록날짜", "Project No", + "검토기한", }); chk검토_CheckedChanged(this.chk검토, null); @@ -180,7 +181,7 @@ namespace FPJ0000 "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + "dbo.getUserName2(epanelid,userhw2) as name_epanel," + "dbo.getUserName2(softwareid,usersub) as name_software," + - "ReqLine,ReqSite,ReqPackage,ReqPlant,pno" + + "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate" + " FROM Projects"; //string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects"; string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and "; @@ -706,6 +707,9 @@ namespace FPJ0000 case 10: this.bs.Sort = "pno"; break; + case 11://검토기한 230209 + this.bs.Sort = "kdate"; + break; default: this.bs.Sort = ""; break; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 9ffb9c1..a7ed6d7 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bTlpqMigpL15TLXClrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9psBGKzvoR+Yx/H+N9Ayrx6JYwl9o1Fd78jiQu/DCMyuMLofhEEl07+Qq3r6JCdmJDDu6Pdc - L3XK2wKDRwf9iBbHXI3kZ53pGcSMhB73VzLvn7sMxn8J5pkLoJCDYDhwcXbVAtNwmMyzoSyeELIlGPaf - 90kKqiwKVQWzA2Vdcqi7FRI/ZR0Pil0ZwvE0NGemlguqLKUqJV3CNQ83oW20GeVnt5GgwMBYMFNgnwzB - PhGEczqIt18S2N0xQQrUfaUqBb2V096txy5TOYpPFEDeugmD3hCsgsbZvzd4/SmOilYvVMz2yjJazjU6 - 6yCjC7kiOm+L8dYC4qkl2CZZ4rXzX1JAtuA3sPGqse6DsqcE1df24LDjIDbS67j19NrNwkZttg+IJZfg - mGJxezojaugJi0Rq5WU1Vyqhd2txyF6DYrqAy2/KhAVaBt9h8dtP3PFlNrg/wx+S8zGLbKm7lJC1F6JI - n4f8o2uWwwK66/OkYIgPCmFScIN/iGxeBGLQGL2r3oH26ktE+QLX0zDxuv18gRDI1YYO928xI6GBeY5I - 4gfYWBqfIykE2CSonQYPciVruGcXMxKOmOfGajv9ydrOWVSf82Hv6ZV7+Uco6g91LiyJf8t/iQAAAABJ + SKESs3bThpqMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6LYwl9o1Fd78jSYu+jCMyuMLofhkEl07+Qq3rawIkZCYw7+j3X + S532tsDg0UE/osUJVyP5WWd6BjEjocf9lcz756+A8V+GefYiKOQgGA5dmluzwDQcJvNsKIsnhGwJhoMX + fJKCKotCVcHsQlmXHOpuhcRPWceDYleGcDwNzdmplYIqS6lKSZdwzcNNaBttRvm5HSQoMDAWzBTYJ0Ow + TwThnA7i7ZcE9nZMkAJ1X6lKQW/ntPfqscdUjuJTBZC3bsGgNwSroHH27w1ef4qjotULFbOzsoyWc43O + OsjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 + pljcmc6IGnrCIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd32ZDR7M8ofknGGRLXWXErL2QhTp + 85B/fN1KWEB3Y4EUDPFBIUwKbvIPkc2LQAwao3fNO9Bee4koX+B6GiZet58vEAK52tTh/i1mJDQwzxFJ + /AAbS+NzJIUAmwS12+BBrmQN9+1iRsIx8/xYbac/Wds5h+rzPuw/s3ov/whF/QFxtyyIRQBP6QAAAABJ RU5ErkJggg== @@ -537,6 +537,6 @@ - 151 + 82 \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index b0059ee..02ccf9d 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1033,6 +1033,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnpno; + private global::System.Data.DataColumn columnkdate; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1659,6 +1661,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn kdateColumn { + get { + return this.columnkdate; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1768,7 +1778,8 @@ namespace FPJ0000 { string ReqSite, string ReqPackage, string ReqPlant, - int pno) { + int pno, + string kdate) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1843,7 +1854,8 @@ namespace FPJ0000 { ReqSite, ReqPackage, ReqPlant, - pno}; + pno, + kdate}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1922,7 +1934,8 @@ namespace FPJ0000 { string ReqSite, string ReqPackage, string ReqPlant, - int pno) { + int pno, + string kdate) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1997,7 +2010,8 @@ namespace FPJ0000 { ReqSite, ReqPackage, ReqPlant, - pno}; + pno, + kdate}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2100,6 +2114,7 @@ namespace FPJ0000 { this.columnReqPackage = base.Columns["ReqPackage"]; this.columnReqPlant = base.Columns["ReqPlant"]; this.columnpno = base.Columns["pno"]; + this.columnkdate = base.Columns["kdate"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2251,6 +2266,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnReqPlant); this.columnpno = new global::System.Data.DataColumn("pno", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnpno); + this.columnkdate = new global::System.Data.DataColumn("kdate", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnkdate); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2330,6 +2347,7 @@ namespace FPJ0000 { this.columnReqSite.MaxLength = 50; this.columnReqPackage.MaxLength = 50; this.columnReqPlant.MaxLength = 50; + this.columnkdate.MaxLength = 20; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12995,6 +13013,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string kdate { + get { + if (this.IskdateNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.kdateColumn])); + } + } + set { + this[this.tableProjects.kdateColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -13822,6 +13856,18 @@ namespace FPJ0000 { public void SetpnoNull() { this[this.tableProjects.pnoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IskdateNull() { + return this.IsNull(this.tableProjects.kdateColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetkdateNull() { + this[this.tableProjects.kdateColumn] = global::System.Convert.DBNull; + } } /// @@ -23125,6 +23171,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("ReqPackage", "ReqPackage"); tableMapping.ColumnMappings.Add("ReqPlant", "ReqPlant"); tableMapping.ColumnMappings.Add("pno", "pno"); + tableMapping.ColumnMappings.Add("kdate", "kdate"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -23141,28 +23188,28 @@ namespace FPJ0000.dsPRJTableAdapters { "[CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial]" + ", [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid]," + " [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [" + - "pno]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @e" + - "date, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @p" + - "rocess, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @impo" + - "rt, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, " + - "@CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @d" + - "iv, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @as" + - "semblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage" + - ", @ReqPlant, @pno);\r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaf" + - "f, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, " + - "process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, ass" + - "et, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode" + - ", category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After," + - " bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS" + - " wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, champ" + - "ionid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid," + - " epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUser" + - "Name(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo" + - ".getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_softw" + - "are, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno FROM Projects WHE" + - "RE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([" + - "status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') " + - "THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; + "pno], [kdate]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @" + + "sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, " + + "@part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progre" + + "ss, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @user" + + "process, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bF" + + "anOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @desi" + + "gnid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @R" + + "eqPackage, @ReqPlant, @pno, @kdate);\r\nSELECT idx, status, pdate, name, usermain," + + " usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManag" + + "er, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, prog" + + "ress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS l" + + "asthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_B" + + "efore, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS P" + + "rogressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qd" + + "ate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, desi" + + "gnid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_cham" + + "pion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS n" + + "ame_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(software" + + "id) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno," + + " kdate FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status]" + + " = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\'" + + " WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -23222,6 +23269,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE Projects\r\nSET status = @status, pdate = @pdate, name = @name, userm" + @@ -23239,22 +23287,22 @@ namespace FPJ0000.dsPRJTableAdapters { "ate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, as" + "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, \r\n " + " userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, R" + - "eqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno\r\nWHERE (idx = @Origin" + - "al_idx); \r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, " + - "edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, c" + - "osto, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel," + - " path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category" + - ", userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bF" + - "anOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' A" + - "S wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo" + - ".getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid," + - " softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(desig" + - "nid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserNa" + - "me(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userA" + - "ssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno FROM Projects WHERE (idx = " + - "@idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'" + - "1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status" + - "] = \'취소\') THEN \'9\' ELSE \'5\' END)"; + "eqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate\r\nWHERE" + + " (idx = @Original_idx); \r\nSELECT idx, status, pdate, name, usermain, usersub, r" + + "eqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, " + + "part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, impor" + + "t, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory," + + " gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_" + + "After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj," + + " \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate," + + " championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assem" + + "blyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.g" + + "etUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembl" + + "y, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name" + + "_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate FROM" + + " Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN (" + + "[status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\')" + + " THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -23314,6 +23362,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", 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, "", "", "")); } @@ -23336,7 +23385,7 @@ namespace FPJ0000.dsPRJTableAdapters { bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, - ReqLine, ReqSite, ReqPackage, ReqPlant, pno + ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -23359,7 +23408,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, - ReqPackage, ReqPlant, pno + ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -23371,7 +23420,7 @@ WHERE (idx = @idx)"; bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, - ReqPackage, ReqPlant, pno + ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -23636,7 +23685,8 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string ReqSite, string ReqPackage, string ReqPlant, - global::System.Nullable pno) { + global::System.Nullable pno, + string kdate) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -23980,6 +24030,12 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.InsertCommand.Parameters[57].Value = global::System.DBNull.Value; } + if ((kdate == null)) { + this.Adapter.InsertCommand.Parameters[58].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[58].Value = ((string)(kdate)); + } 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)) { @@ -24059,6 +24115,7 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string ReqPackage, string ReqPlant, global::System.Nullable pno, + string kdate, int Original_idx, int idx) { if ((status == null)) { @@ -24404,8 +24461,14 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(idx)); + if ((kdate == null)) { + this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[58].Value = ((string)(kdate)); + } + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[60].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 4dba752..2c3a015 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -21,8 +21,8 @@ WHERE (idx = @Original_idx) - INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno); -SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) + INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqstaff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userManager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remark_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [orderno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno], [kdate]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userManager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans, @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate); +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -82,6 +82,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -92,7 +93,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, - ReqLine, ReqSite, ReqPackage, ReqPlant, pno + ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -115,9 +116,9 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, - userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno + userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate WHERE (idx = @Original_idx); -SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -177,6 +178,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -256,6 +258,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -283,7 +286,7 @@ WHERE (import = 1) AND (gcode = @gcode) bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, - ReqPackage, ReqPlant, pno + ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (idx = @idx) @@ -300,7 +303,7 @@ WHERE (idx = @idx) bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, - ReqPackage, ReqPlant, pno + ReqPackage, ReqPlant, pno, kdate FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -3026,7 +3029,7 @@ WHERE (idx = @idx) - + @@ -3432,10 +3435,17 @@ WHERE (idx = @idx) + + + + + + + - + @@ -3479,7 +3489,7 @@ WHERE (idx = @idx) - + @@ -3524,7 +3534,7 @@ WHERE (idx = @idx) - + @@ -3661,7 +3671,7 @@ WHERE (idx = @idx) - + @@ -3835,7 +3845,7 @@ WHERE (idx = @idx) - + @@ -3873,7 +3883,7 @@ WHERE (idx = @idx) - + @@ -3989,7 +3999,7 @@ WHERE (idx = @idx) - + @@ -4040,7 +4050,7 @@ WHERE (idx = @idx) - + @@ -4053,7 +4063,7 @@ WHERE (idx = @idx) - + @@ -4225,7 +4235,7 @@ WHERE (idx = @idx) - + @@ -4431,7 +4441,7 @@ WHERE (idx = @idx) - + @@ -4476,7 +4486,7 @@ WHERE (idx = @idx) - + @@ -4553,7 +4563,7 @@ WHERE (idx = @idx) - + @@ -4744,7 +4754,7 @@ WHERE (idx = @idx) - + @@ -4883,7 +4893,7 @@ WHERE (idx = @idx) - + @@ -4950,7 +4960,7 @@ WHERE (idx = @idx) - + @@ -4996,7 +5006,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index ff3fefd..c2a43f5 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -3212,6 +3212,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnprogress; + private global::System.Data.DataColumn columnuserprocess; + + private global::System.Data.DataColumn columnstatus; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public UserScheduleTableDataTable() { @@ -3389,6 +3393,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 userprocessColumn { + get { + return this.columnuserprocess; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn statusColumn { + get { + return this.columnstatus; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3442,7 +3462,9 @@ namespace FPJ0000 { string ddate, bool complete, string uidname, - int progress) { + int progress, + string userprocess, + string status) { UserScheduleTableRow rowUserScheduleTableRow = ((UserScheduleTableRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3462,7 +3484,9 @@ namespace FPJ0000 { ddate, complete, uidname, - progress}; + progress, + userprocess, + status}; rowUserScheduleTableRow.ItemArray = columnValuesArray; this.Rows.Add(rowUserScheduleTableRow); return rowUserScheduleTableRow; @@ -3511,6 +3535,8 @@ namespace FPJ0000 { this.columncomplete = base.Columns["complete"]; this.columnuidname = base.Columns["uidname"]; this.columnprogress = base.Columns["progress"]; + this.columnuserprocess = base.Columns["userprocess"]; + this.columnstatus = base.Columns["status"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3552,6 +3578,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnuidname); this.columnprogress = new global::System.Data.DataColumn("progress", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnprogress); + this.columnuserprocess = new global::System.Data.DataColumn("userprocess", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuserprocess); + this.columnstatus = new global::System.Data.DataColumn("status", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnstatus); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnSubIDX, this.columnidx}, true)); @@ -3578,6 +3608,8 @@ namespace FPJ0000 { this.columnsdate.MaxLength = 50; this.columnddate.MaxLength = 50; this.columnuidname.MaxLength = 50; + this.columnuserprocess.MaxLength = 100; + this.columnstatus.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6173,6 +6205,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string userprocess { + get { + if (this.IsuserprocessNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserScheduleTable.userprocessColumn])); + } + } + set { + this[this.tableUserScheduleTable.userprocessColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string status { + get { + if (this.IsstatusNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserScheduleTable.statusColumn])); + } + } + set { + this[this.tableUserScheduleTable.statusColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsScheduleNoNull() { @@ -6352,6 +6416,30 @@ namespace FPJ0000 { public void SetprogressNull() { this[this.tableUserScheduleTable.progressColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsuserprocessNull() { + return this.IsNull(this.tableUserScheduleTable.userprocessColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetuserprocessNull() { + this[this.tableUserScheduleTable.userprocessColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsstatusNull() { + return this.IsNull(this.tableUserScheduleTable.statusColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetstatusNull() { + this[this.tableUserScheduleTable.statusColumn] = global::System.Convert.DBNull; + } } /// @@ -9163,6 +9251,8 @@ ORDER BY title, ww"; tableMapping.ColumnMappings.Add("complete", "complete"); tableMapping.ColumnMappings.Add("uidname", "uidname"); tableMapping.ColumnMappings.Add("progress", "progress"); + tableMapping.ColumnMappings.Add("userprocess", "userprocess"); + tableMapping.ColumnMappings.Add("status", "status"); this._adapter.TableMappings.Add(tableMapping); } @@ -9182,7 +9272,7 @@ ORDER BY title, ww"; this._commandCollection[0].CommandText = @"SELECT Projects.idx, dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) AS ScheduleNo, Projects.gcode, Projects.name, EETGW_ProjectsSchedule.idx AS SubIDX, EETGW_ProjectsSchedule.no, EETGW_ProjectsSchedule.seq, EETGW_ProjectsSchedule.title, EETGW_ProjectsSchedule.uid, EETGW_ProjectsSchedule.sw, EETGW_ProjectsSchedule.ew, EETGW_ProjectsSchedule.swa, EETGW_ProjectsSchedule.ewa, Projects.sdate, Projects.ddate, EETGW_ProjectsSchedule.complete, EETGW_ProjectsSchedule.uidname, - EETGW_ProjectsSchedule.progress + EETGW_ProjectsSchedule.progress, Projects.userprocess, Projects.status FROM Projects LEFT OUTER JOIN EETGW_ProjectsSchedule ON Projects.gcode = EETGW_ProjectsSchedule.gcode AND Projects.idx = EETGW_ProjectsSchedule.project WHERE (Projects.gcode = @gcode) AND (Projects.status = '검토' OR diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index 209d0fa..a3b4ca9 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -334,7 +334,7 @@ ORDER BY title, ww SELECT Projects.idx, dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) AS ScheduleNo, Projects.gcode, Projects.name, EETGW_ProjectsSchedule.idx AS SubIDX, EETGW_ProjectsSchedule.no, EETGW_ProjectsSchedule.seq, EETGW_ProjectsSchedule.title, EETGW_ProjectsSchedule.uid, EETGW_ProjectsSchedule.sw, EETGW_ProjectsSchedule.ew, EETGW_ProjectsSchedule.swa, EETGW_ProjectsSchedule.ewa, Projects.sdate, Projects.ddate, EETGW_ProjectsSchedule.complete, EETGW_ProjectsSchedule.uidname, - EETGW_ProjectsSchedule.progress + EETGW_ProjectsSchedule.progress, Projects.userprocess, Projects.status FROM Projects LEFT OUTER JOIN EETGW_ProjectsSchedule ON Projects.gcode = EETGW_ProjectsSchedule.gcode AND Projects.idx = EETGW_ProjectsSchedule.project WHERE (Projects.gcode = @gcode) AND (Projects.status = '검토' OR @@ -368,6 +368,8 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch + + @@ -813,6 +815,20 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch + + + + + + + + + + + + + +