diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index fd7be30..0748220 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -30,26 +30,26 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = 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.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); + 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.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = 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(); @@ -100,7 +100,6 @@ this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); @@ -123,18 +122,19 @@ this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -223,7 +223,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"; @@ -315,7 +314,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); @@ -601,173 +599,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 20; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType22; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType23; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType24; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; - this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - numberCellType7.NullDisplay = "--"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; - this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType25; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType3.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType3.TimeDefault = new System.DateTime(2023, 1, 17, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType3; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType4.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; - dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType4.TimeDefault = new System.DateTime(2023, 1, 17, 22, 53, 4, 0); - this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType4; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "초과종료"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType26; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "기술분류"; - this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType27; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "기술레벨"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType8.DecimalPlaces = 2; - numberCellType8.NegativeRed = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "기술료($K)"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType28; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "#"; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ShowRowSelector = true; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); @@ -818,7 +649,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -842,7 +672,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -878,7 +707,6 @@ // tbProcess // this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); - this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbProcess.Name = "tbProcess"; this.tbProcess.Size = new System.Drawing.Size(200, 37); // @@ -981,6 +809,174 @@ this.splitContainer1.SplitterWidth = 10; this.splitContainer1.TabIndex = 6; // + // 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 = 20; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; + this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; + this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; + this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; + this.fpSpread1_Sheet1.Columns.Get(10).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(10).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; + numberCellType2.MaximumValue = 999999999999999D; + numberCellType2.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; + numberCellType3.MaximumValue = 999999999999999D; + numberCellType3.MinimumValue = -999999999999999D; + numberCellType3.NullDisplay = "--"; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; + this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; + this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType1.TimeDefault = new System.DateTime(2023, 2, 15, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); + dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; + dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; + dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); + dateTimeCellType2.TimeDefault = new System.DateTime(2023, 2, 15, 22, 53, 4, 0); + this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "초과종료"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "기술분류"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "기술레벨"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 2; + numberCellType4.NegativeRed = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "기술료($K)"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag"; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "#"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataAutoCellTypes = false; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ShowRowSelector = true; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1000,13 +996,13 @@ ((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.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1074,7 +1070,6 @@ private System.Windows.Forms.ToolStripButton btOpenFolder; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.ToolStripButton toolStripButton6; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripButton toolStripButton8; private System.Windows.Forms.ToolStripButton toolStripButton7; @@ -1087,5 +1082,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripMenuItem 개인별프로젝트스케쥴현황ToolStripMenuItem; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 65e719d..8a36d05 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -429,7 +429,7 @@ namespace FPJ0000 private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) { var newdr = this.dsMSSQL.JobReport.NewJobReportRow(); - newdr.status = "진행 중"; + newdr.status = "진행 완료"; newdr.pdate = DateTime.Now.ToShortDateString(); if (DateTime.Now.DayOfWeek == DayOfWeek.Sunday || DateTime.Now.DayOfWeek == DayOfWeek.Saturday) newdr.hrs = 0; @@ -539,7 +539,9 @@ namespace FPJ0000 | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered | FarPoint.Excel.ExcelSaveFlags.NoFormulas | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); + var dlg =FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?"); + if (dlg == DialogResult.Yes) + util.RunExplorer(sd.FileName); } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 668ae51..265ef9d 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -243,20 +243,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZJZTxNRGIZ7JT/BoBdekhiFaI3rhYKABUxw - QyCIbKUQEJBADSZiTcGILAYkQKKGQDReqAEXKGABKaXQhtbIIrKUAmVJWCrQZQY6U17PTCtgQuKXPDkX - Z94n870zAm6CHqjiL5doleGl2t/BMi1FTpqnjDt1dHhJHx36VDN8TqquOBzxbh8f2j0hj3vUS1Z6ZXjc - xFrsG7DYdlixctD4tWBF/mczoktHHaIMhZcn6p6wIs3SqHGa7Zt2QjfDQGdmoJ1moJnahGpiA60jdmww - QNMohfyPM0h6Pkz9IwmWtVLrjk0YZll8n2XIyaCfl2yi27iBryMOInDBsMBCN+9EocKMgPudb/lwVJm/ - 6aYsYktSfR1JVTdQ1VaPgoYyBMh84U8QFZ5FkPwkypvK+VVsNIPFVQeCxN0ML4gsCfjQOdSM5vFXqNLm - 8pK4ylDkvolFZn00xDVXkFiTiKaBRTQP2/BlcB1rpKdgeQ/NC0QVIq8zsixWO9aF10NyFKsyeEl8dRgJ - X0XqixSojXZ+lY5xCkrSw6rdieCCXreAm5Cibjq7NgF6owY1unt40p6DqLKLiK+MgH7aAT0plitYPenu - xEIEQfJdgvMPZc5TeYcQWyGCYbIPhV1pkCuyEf0sEPWqT/gxx0BPiu2bcqKXsGR1IuCRR3Bc6i0RSg8i - sy4Gt6pDEFN+iZdkK2IhbUghbxII7t5gZtHPfWKClRTpl6VxC4TS/XNC6QHykDeEud64VhyI9JcJUI8o - UajMQ9r7BIirI6EnAh35N7REQDtdRKDaWeFCVg+9sEZjYI7l6R6bx93aVCSToKQmGjl1d7bvOBybLBE0 - 7gg426xlR/A/7NwKKbsEp7O/OTQDE1t7PbwXpplZ19G4JpsnTopMbTfNrDusmsFJl2mZgmmJgtHDss3J - wzVvo1mMm8wuiqLWfG63/PTEBYITqW3pfuLW9mMSpcVP0khvk+zG9y/iRtpH3LJ6JLGlwzdBkSQQCAR/ - AKNfn92xxqiIAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSyiipF6WpTQ3s + Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc3ddMMZmuZ18zIv4GWpu5yjO2d+e87ZUgOhH3x4Xjzn + ++H8vucIuAl+qEy4UqpTRJTpfodIdRQ5aZ5y7tTTEaW9dNgz7fB5ibryWOT7A3xo74Q+0aiXrfTq8LiJ + tdg3YbHtsmrloDG6aEXBFzNiysYcwkz5QU/UPeHF2uXRyWm2d8YJ/SwDvZmBboaBdnoLyslNtI3YsckA + zWMUCj7NIvnFMPWPJETaRm04ttA/x+LHHENOBn28ZAsq4ya+jTiIwIX+RRb6BSeK5GYEPuh6x4ejywOm + bkkjt8U1N5BcfRPV7Q0obCxHoNQHAQRh0TkEy86gormCX8VGM1hacyA4WcXwgqjSwI9dQy1omXiNal0e + L4mvCkPe2zhkNcRAVHsVSbVJaB5cQsuwDV9/bmCd9BQi09C8QFgpPOgvzWZ14914MyRDiTKTlyTUhJPw + NaS9TIXaaOdX6ZygoCA9rNmdCCnscQu4CS1W0Tl1iTAYtajV38fTjlxEl19CQlUkDDMOGEixXMFqk7sT + CxEEy/YILjySOs/mH0VcpRD9pl4UdadDJs9BzPMgNCg/Y2CegYEU2zvtRA9h2epE4GOP4JTES+wnOYKs + +ljcrglFbMVlXpIjj4OkMZW8SRC4+34ziz7uExOspEjfbK1b4Cc5NO8nOUwe8oJfnheulwQh41Ui1CMK + FCnykf4hEaKaKBiIQE/+DR0R0E4XESh3V7iYraEX12kMzrM8qvEF3KtLQwoJimtjkFt/d+eOw7HFEkHT + roCzzVl2Bf/Dzq2Qukfgn/PdoRmY2N7v4f0wzZhdJ+KbbZ44KTKtY2p2w2HVDBpdUysUppYpGD2s2Jw8 + XPM2msW4adZFUdS6953WX564QHA6rT3DV9TWcVKssPiKm+gdUtz4/EXURHuLWteOJ7V2+iTKkwUCgeAP + hd2fyiWmpNkAAAAASUVORK5CYII= @@ -340,9 +340,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 325, 17 @@ -394,7 +391,7 @@ 561, 17 - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -404,7 +401,7 @@ AAD/////AQgAAP////8AAQgAAAs= - + AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 @@ -420,41 +417,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djXT1NRHAdw/gjj3ogsZUPLUsQFzmhMTIz/ - gC+ixhgRhCLKaqG0bBBUhkrijBVKN6VUVvEJNQE1EowaMcqSKV/PTW8T6gM955LgS7/JeT6f3Hu/53dz - PNxxxx0BeXj89YUHxzrG7x/tRcMRsg7bUH/IhrrEHtQm9ODewW7cPdCNO/vJ2teFmr1dqI7vxO09naiK - 60Dl7g5U7HqF8liyYqwoi7aiNMqKksh2FIvbUSSyQBlBVngbFGFtKAw1jxeEmJL47V1nmXGQh5iRF2we - 47d3neXGFQSbkR/UCn571/kfOFkgC3AJuLKYdigjjcgXaVAoMqBIbKHCyQJM9MClPDlFlB69jz9iZnIO - 3Y0fIAvTUeGkOxmAQnHck2urfIeFKU7QU+HydhjpgUJwxVFmPLrUhfk/8zwN+Dk0AWmEmgqX688AZMWV - RltQdcqEqbEZngbMTs+h5mwr5KGtVLgcPwM9kA1HShGnx/f3ozzNnheSXuSHGqhx2b4MQFocd5TIxTq8 - 1X3mWfZ0NgyQg1fLhMvyYQFS4hRiI8wVzqUY7B0m310LMy7LW08PpMEVRZJSXHQuxciX31DEa8l3Z2LG - 3drOAHSFK4niSzE+y9Pspag+0woy9AXhbnrp6IGL4bjxJY8wYMDylafZ8yzVBlmIXjAucxsDcDEcN1sL - wg3ob3MGPk3pgTRYLxh3w1NLD1wMxw1+pciM8hNG51c8NYfK0wQUaBSEy9jKAFwM5xj88jAjGpM6nUry - i5REFtsCaYCBGSfZoqEHusI5Zqs0RAdj6RueZ88n2zCyApuYcembWYAUOMc5lx2oRp9miOfZY63tR6Zf - MxMufVMLPZAWxxVCFmRCrkiNbwMjPM+eJ8ndyPRpocalbWQA0uIcbeW+OWWiDpOjC34WSGlKTxKUt5YK - d30DA5AF52hrtr8W9efanUrzY3AMEl8VFS51vZoeyIpzFCLTVw2dso/n2ZMT2UyFS1nHABSCcxRC4vMS - HeRvZnpiFta6fqR5qqhw19Y20wOF4hyFkHg1I9XzOcE1IcNTQ4VLXsMCXAKOthD/4pJXN9ED/wfu6ioG - IMGNLzfu8koV/dUHd5HD3ZUsJ+7KCtV5fnt33HGHPh4efwGK4T31pTiJAAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM + X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J + dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi + pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5 + jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz + 6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX + HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D + O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm + 3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1 + L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek + v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3 + UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq + 3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr + dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM + QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji - g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6etQCnbkwQSBBJFEjGSSIksynGGmUaJSXvvmOBLT3Kf7y9z - 58x3MwH++OOPhDw+3HWu9lCr+9HBTjw8wK2kDtQkdqB6fzse7GtH1d423N/Thnu7ubXLhbs7XbizoxWV - Ca24He9ExXYnbsW14GYst1TNKI9pRll0M25sa0Lp1iaURL1FsZJbWxzQRzpQFGF3Xw9nz4rb+84846AL - t0OrsI+J2/vOfOOuK+wolNsgbu87/wNXEEYDJMTdTnCiLM4GvcqMUhWL8thmybiCUJYcSPrkSmNZdD4b - wNT3H+iqG0RxDCMZlx9CASQ+1iMs/oyjogf6rVZJOG2wlRxI+s6VxDMYHRoXecDMzxk8Pe+CPspGjcvb - TAEkLUSZqglVJx2zR+zJpHsaFcdY6JV2KlxuUCM5kATnaWtJtA0vUztFnpAvg2PQxZlQFGknxuXIKICk - OE8hdMpGuGrfizwhvewwtOFGYpwmkAZIgfMUoiDKiAHXiMgTYi3rRp7cQoTTbGLIgbQ4vhB6JfeuxZsw - +vGP0swAT845kRtq8YnL3kgBpMV52qqLsKHyBIvpid+lmRibQkmSBdqQRq849QYLOVAKztPWfAWDFynt - Ik9Ir20Y6iCDV1zWegqgVBxfCK2cQV3yXGCP9RMHNHrFZa4zkwOl4grkLG4dt/51xPr9ZuQEMV5xGWsp - gFJwhQob8lUGfP3gFmlCSWpPt0AtM/rEpa8xkQNpcfx3TiNvQL/rs0gTwhS/Q5bMQIRLW00DpMTlhJrQ - UtMnsoR0M0PIDHpNjEtbZSQH0uDywix4fqlNZAkZ6f8GTWQDNDKGGHdtJQWQFJcfZkX5Ueucy8IEd1ko - TjRT41JXUABJcPz4ylG8mVsK7rpVfaoJ6kATNe7qcgM5kATHz1ZdgkmkCeFLkRlokIS7sowCSILjZ2v2 - ZgNaH/Vhcnwazod9yJC9loxLWfqGHEiC4wd/XnDj7IRID3z1T0+OxyUvoQES4HwNflpc8uIGcuD/wF1e - RAHkcO75xl1YWE/+64P/kcP/K5lP3MUF9WfE7f3xxx/yBAT8AiicPppMUuJ9AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH + 331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO + fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt + QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6 + pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH + T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS + FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q + elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U + 0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC + Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS + cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01 + AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs + tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm + QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK + IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index 4f627cc..ae2a8d4 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -51,11 +51,13 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbOt2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lbotReason = new System.Windows.Forms.ToolStripStatusLabel(); this.cmbType = new System.Windows.Forms.ComboBox(); this.btSave = new System.Windows.Forms.Button(); this.dtPdate = new System.Windows.Forms.DateTimePicker(); this.cmbUser = new System.Windows.Forms.ComboBox(); - this.tbProjectIndex = new System.Windows.Forms.TextBox(); this.tbOt = new System.Windows.Forms.TextBox(); this.tbWW = new System.Windows.Forms.TextBox(); this.cmbProcess = new System.Windows.Forms.ComboBox(); @@ -76,9 +78,7 @@ this.tbTag = new System.Windows.Forms.TextBox(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); - this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); - this.lbOt2 = new System.Windows.Forms.ToolStripStatusLabel(); - this.lbotReason = new System.Windows.Forms.ToolStripStatusLabel(); + this.tbProjectIndex = new System.Windows.Forms.Button(); hrsLabel = new System.Windows.Forms.Label(); typeLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -130,7 +130,7 @@ // projectLabel // projectLabel.AutoSize = true; - projectLabel.Location = new System.Drawing.Point(16, 64); + projectLabel.Location = new System.Drawing.Point(16, 63); projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); projectLabel.Name = "projectLabel"; projectLabel.Size = new System.Drawing.Size(53, 12); @@ -289,6 +289,24 @@ this.lbIndex.Size = new System.Drawing.Size(17, 17); this.lbIndex.Text = "--"; // + // toolStripStatusLabel2 + // + this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; + this.toolStripStatusLabel2.Size = new System.Drawing.Size(10, 17); + this.toolStripStatusLabel2.Text = "|"; + // + // lbOt2 + // + this.lbOt2.Name = "lbOt2"; + this.lbOt2.Size = new System.Drawing.Size(121, 17); + this.lbOt2.Text = "toolStripStatusLabel3"; + // + // lbotReason + // + this.lbotReason.Name = "lbotReason"; + this.lbotReason.Size = new System.Drawing.Size(121, 17); + this.lbotReason.Text = "toolStripStatusLabel4"; + // // cmbType // this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -333,17 +351,6 @@ this.cmbUser.TabIndex = 6; this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); // - // tbProjectIndex - // - this.tbProjectIndex.Location = new System.Drawing.Point(759, 60); - this.tbProjectIndex.Margin = new System.Windows.Forms.Padding(4); - this.tbProjectIndex.Name = "tbProjectIndex"; - this.tbProjectIndex.ReadOnly = true; - this.tbProjectIndex.Size = new System.Drawing.Size(64, 21); - this.tbProjectIndex.TabIndex = 17; - this.tbProjectIndex.TabStop = false; - this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // tbOt // this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true)); @@ -421,10 +428,11 @@ this.tbProject.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.tbProject.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbProject.Font = new System.Drawing.Font("굴림", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbProject.FormattingEnabled = true; - this.tbProject.Location = new System.Drawing.Point(73, 60); + this.tbProject.Location = new System.Drawing.Point(73, 58); this.tbProject.Name = "tbProject"; - this.tbProject.Size = new System.Drawing.Size(679, 20); + this.tbProject.Size = new System.Drawing.Size(679, 23); this.tbProject.TabIndex = 16; // // richTextBoxEx1 @@ -449,6 +457,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.tbProjectIndex); this.panel1.Controls.Add(this.grpkisul); this.panel1.Controls.Add(this.dateTimePicker2); this.panel1.Controls.Add(this.dateTimePicker1); @@ -459,7 +468,6 @@ this.panel1.Controls.Add(this.tbProject); this.panel1.Controls.Add(projectLabel); this.panel1.Controls.Add(this.tbHrs); - this.panel1.Controls.Add(this.tbProjectIndex); this.panel1.Controls.Add(label2); this.panel1.Controls.Add(this.lbTitleTip); this.panel1.Controls.Add(hrsLabel); @@ -594,23 +602,15 @@ this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // toolStripStatusLabel2 + // tbProjectIndex // - this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(10, 17); - this.toolStripStatusLabel2.Text = "|"; - // - // lbOt2 - // - this.lbOt2.Name = "lbOt2"; - this.lbOt2.Size = new System.Drawing.Size(121, 17); - this.lbOt2.Text = "toolStripStatusLabel3"; - // - // lbotReason - // - this.lbotReason.Name = "lbotReason"; - this.lbotReason.Size = new System.Drawing.Size(121, 17); - this.lbotReason.Text = "toolStripStatusLabel4"; + this.tbProjectIndex.Location = new System.Drawing.Point(754, 58); + this.tbProjectIndex.Name = "tbProjectIndex"; + this.tbProjectIndex.Size = new System.Drawing.Size(68, 23); + this.tbProjectIndex.TabIndex = 25; + this.tbProjectIndex.Text = "--"; + this.tbProjectIndex.UseVisualStyleBackColor = true; + this.tbProjectIndex.Click += new System.EventHandler(this.tbProjectIndex_Click); // // fJobReport_Add // @@ -654,7 +654,6 @@ private System.Windows.Forms.Button btSave; private System.Windows.Forms.DateTimePicker dtPdate; private System.Windows.Forms.ComboBox cmbUser; - private System.Windows.Forms.TextBox tbProjectIndex; private System.Windows.Forms.TextBox tbOt; private System.Windows.Forms.TextBox tbWW; private System.Windows.Forms.ComboBox cmbProcess; @@ -677,5 +676,6 @@ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2; private System.Windows.Forms.ToolStripStatusLabel lbOt2; private System.Windows.Forms.ToolStripStatusLabel lbotReason; + private System.Windows.Forms.Button tbProjectIndex; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index afd5ad1..e758332 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -778,5 +778,36 @@ namespace FPJ0000.JobReport_ } } - } + + private void tbProjectIndex_Click(object sender, EventArgs e) + { + if(int.TryParse(tbProjectIndex.Text, out int pidx)) + { + if (pidx < 1) return; + + var ta = new dsPRJTableAdapters.ProjectsTableAdapter(); + var dr = ta.GetbyIDX(pidx).First(); + var f = new fProjectData(dr,false); + f.Show(); + //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + //{ + // this.Validate(); + // dr.EndEdit(); + // try + // { + // var cnt = ta.Update(this.dsPRJ.Projects);//.UpdateAll(this.dsMSSQL.Projects); + // dsPRJ.Projects.AcceptChanges(); + // if(cnt != 1) + // { + // FCOMMON.Util.MsgE("저장 실패"); + // } + // } + // catch (Exception ex) + // { + // FCOMMON.Util.MsgE(ex.Message); + // } + //} + } + } + } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index a56d405..a10cac2 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -162,6 +162,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs index 218cd42..bfebd5b 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.Designer.cs @@ -61,11 +61,14 @@ 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.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); 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(); this.tbProcess = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.btRefresh = new System.Windows.Forms.Button(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -83,11 +86,14 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.radioButton2); + this.panel1.Controls.Add(this.radioButton1); this.panel1.Controls.Add(this.tbWW); this.panel1.Controls.Add(this.btSave); this.panel1.Controls.Add(this.cmbUser); this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.tbProcess); + this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.btRefresh); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; @@ -97,6 +103,29 @@ this.panel1.Size = new System.Drawing.Size(1114, 58); this.panel1.TabIndex = 7; // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(514, 30); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(113, 16); + this.radioButton2.TabIndex = 15; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "프로젝트/담당자"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Checked = true; + this.radioButton1.Location = new System.Drawing.Point(365, 30); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(113, 16); + this.radioButton1.TabIndex = 14; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "담당자/프로젝트"; + this.radioButton1.UseVisualStyleBackColor = true; + // // tbWW // this.tbWW.Location = new System.Drawing.Point(243, 9); @@ -147,6 +176,16 @@ this.tbProcess.TabIndex = 5; this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(363, 10); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "정렬 방식"; + this.label2.Click += new System.EventHandler(this.label2_Click); + // // label1 // this.label1.AutoSize = true; @@ -453,5 +492,8 @@ private FarPoint.Win.Spread.FpSpread fp1; private System.Windows.Forms.TextBox tbWW; private FarPoint.Win.Spread.SheetView fp1_Sheet1; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs index 77e733e..3979bc7 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs @@ -69,18 +69,24 @@ namespace FPJ0000.JobReport_ //if (tbProcess.SelectedIndex != 0) userlist = userlist.Where(t => t.processs == tbProcess.Text); //해당 공정의 인원만 처리한다 + uids = new List(); + names = new List(); foreach (var dr in userlist) { //var dr = item.First(); - cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id, dr.name)); + cmbUser.Items.Add(String.Format("[{0}] {1}", dr.id.Trim(), dr.name.Trim())); + uids.Add(dr.id.Trim()); + names.Add(dr.name.Trim()); } //if (tbProcess.SelectedIndex > 0) - cmbUser.Text = string.Format("[{0}] {1}", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK); + 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; //기본전체로 선택해준다. } + List uids, names; + void refrehData() { @@ -97,7 +103,7 @@ namespace FPJ0000.JobReport_ var uid = string.Empty; if (cmbUser.SelectedIndex > 0) { - uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; + uid = username.Substring(1, username.IndexOf("]") - 1);// "395552"; userfilter = cmbUser.SelectedIndex == 0 ? "%" : "%" + uid + "%"; } @@ -111,15 +117,19 @@ namespace FPJ0000.JobReport_ var namelist = dr.uidname.Replace(",", "/").Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); for (int i = 0; i < userlist.Length; i++) { - var userid = userlist[i]; + var userid = userlist[i].Trim(); if (uid.isEmpty() == false && uid.Equals(userid) == false) continue; var usernm = userid; - if(userlist.Length == namelist.Length) usernm = namelist[i]; + if (userlist.Length == namelist.Length) usernm = namelist[i].Trim(); + + //없는 사용자 제외 + if (uids.Contains(userid) == false && names.Contains(usernm) == false) continue; + //모든 컬럼의 데이터를 쓴다 단 idx는 제외한다 var newdr = dtnew.NewUserScheduleTableRow(); newdr.idx = dtnew.Rows.Count; - newdr.uid = userid; - newdr.uidname = usernm; + newdr.uid = userid.Trim(); + newdr.uidname = usernm.Trim(); foreach (DataColumn dc in dtnew.Columns) { var colname = dc.ColumnName.ToLower(); @@ -128,6 +138,7 @@ namespace FPJ0000.JobReport_ if (colname.Equals("uidname")) continue; newdr[colname] = dr[colname]; } + newdr.userprocess = newdr.userprocess.Trim(); dtnew.AddUserScheduleTableRow(newdr); } } @@ -147,6 +158,7 @@ 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 = "시작"; @@ -222,127 +234,253 @@ namespace FPJ0000.JobReport_ //사용자별로 그룹을 먼저 짓는다 var ridx = 0; + var gidx = 0; - var grp_prc = dtnew.GroupBy(t => t.userprocess).OrderBy(t => t.Key); - foreach (var prc in grp_prc) + if (radioButton1.Checked) { - var grp_user = prc.GroupBy(t => t.uid).OrderBy(t => t.Key); - foreach (var user in grp_user) + //var grp_prc = dtnew.GroupBy(t => t.userprocess).OrderBy(t => t.Key); + //foreach (var prc in grp_prc) { - //프로젝트별로 데이터를 표시한다. - var grp_list = user.GroupBy(t => t.name).OrderBy(t => t.Key); - foreach (var grp in grp_list) + gidx += 1; + var grp_user = dtnew.GroupBy(t => t.uid).OrderBy(t => t.Key); + foreach (var user in grp_user) { - 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("진행")) + //프로젝트별로 데이터를 표시한다. + var grp_list = user.GroupBy(t => t.name).OrderBy(t => t.Key); + foreach (var grp in grp_list) { - 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; - } + 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); + var processName = grp.Max(t => t.userprocess); + //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; - 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; + 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 = $"{processName}"; + 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}"; + fp1.ActiveSheet.Cells[ridx, cidx].CellType = ctdef; fp1.ActiveSheet.Cells[ridx, cidx].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; fp1.ActiveSheet.Cells[ridx, cidx++].Value = $"{user.Key}"; - //세부항목데이터를 넣는다 - 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++) + if (status.Equals("진행")) { - var col = fp1.ActiveSheet.Columns[i]; - if (col.Tag == null) continue; - var colno = int.Parse(col.Tag.ToString()); - if (colno >= isw && colno <= iew) + 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, 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++) { - // 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) + var col = fp1.ActiveSheet.Columns[i]; + if (col.Tag == null) continue; + var colno = int.Parse(col.Tag.ToString()); + if (colno >= isw && colno <= iew) { - 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; + // 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; + } - 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; } - } + } + } + else + { + //프로젝트 담당자 + var grp_prj = dtnew.GroupBy(t => t.name).OrderBy(t => t.Key); + foreach (var prj in grp_prj) + { + var grp_user = prj.GroupBy(t => t.uid).OrderBy(t => t.Key); + foreach (var user in grp_user) + { + //프로젝트별로 데이터를 표시한다. + var grp_prc = user.GroupBy(t => t.userprocess).OrderBy(t => t.Key); + foreach (var prc in grp_prc) + { + var prjname = prc.Key; + var sdate = prc.Max(t => t.sdate); + var ddate = prc.Max(t => t.ddate); + var uname = prc.Max(t => t.uidname); + var status = prc.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("진행")) + { + 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, 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 = prj.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 = 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 prc) + { + //예측일 + 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; + } + } + + } } - - - + fp1.ActiveSheet.FrozenColumnCount = 7; fp1.ActiveSheet.AllowNoteEdit = true; fp1.ActiveSheet.AutoUpdateNotes = true; for (int i = 0; i < fp1.ActiveSheet.RowCount; i++) @@ -352,10 +490,11 @@ namespace FPJ0000.JobReport_ 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[2].Width = 50; + fp1.ActiveSheet.Columns[3].Width = 35; + fp1.ActiveSheet.Columns[4].Width = 250; fp1.ActiveSheet.Columns[5].Width = 75; + fp1.ActiveSheet.Columns[6].Width = 75; return; @@ -390,5 +529,10 @@ namespace FPJ0000.JobReport_ if (binit == false) return; refrehData(); } + + private void label2_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 746034e..090a50d 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -57,8 +57,9 @@ System.Windows.Forms.Label label16; System.Windows.Forms.Label label17; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.Label label18; this.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -213,6 +214,7 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); + this.textBox12 = new System.Windows.Forms.TextBox(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -240,6 +242,7 @@ label15 = new System.Windows.Forms.Label(); label16 = new System.Windows.Forms.Label(); label17 = new System.Windows.Forms.Label(); + label18 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -765,6 +768,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -915,8 +919,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle9; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -971,6 +975,8 @@ // panel7 // this.panel7.BackColor = System.Drawing.Color.Gainsboro; + this.panel7.Controls.Add(this.textBox12); + this.panel7.Controls.Add(label18); this.panel7.Controls.Add(this.cmbReqPlant); this.panel7.Controls.Add(label16); this.panel7.Controls.Add(this.cmbReqPackage); @@ -1903,6 +1909,7 @@ // 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"; @@ -2409,8 +2416,8 @@ // this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn5.DataPropertyName = "remark"; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle10; this.dataGridViewTextBoxColumn5.HeaderText = "비고"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; @@ -2485,6 +2492,7 @@ // 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"; @@ -2644,6 +2652,24 @@ // this.taToDo.ClearBeforeFill = true; // + // textBox12 + // + this.textBox12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "jasmin", true)); + this.textBox12.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox12.Location = new System.Drawing.Point(412, 74); + this.textBox12.Name = "textBox12"; + this.textBox12.Size = new System.Drawing.Size(128, 21); + this.textBox12.TabIndex = 98; + // + // label18 + // + label18.AutoSize = true; + label18.Location = new System.Drawing.Point(318, 78); + label18.Name = "label18"; + label18.Size = new System.Drawing.Size(93, 12); + label18.TabIndex = 97; + label18.Text = "Jasmin Task ID"; + // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -2865,5 +2891,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton8; private System.Windows.Forms.LinkLabel linkLabel9; private System.Windows.Forms.TextBox textBox11; + private System.Windows.Forms.TextBox textBox12; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 123565c..ffc4661 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -9,12 +9,14 @@ namespace FPJ0000 public partial class fProjectData : FCOMMON.fBase { dsPRJ.ProjectsRow dr = null; - public fProjectData(dsPRJ.ProjectsRow pidx_) + bool EditMode = false; + public fProjectData(dsPRJ.ProjectsRow pidx_,bool editmode_=true) { InitializeComponent(); this.UseFormSetting = false; this.dr = pidx_; this.dsPRJ.ProjectsHistory.TableNewRow += ProjectsHistory_TableNewRow; + this.EditMode = editmode_; } void ProjectsHistory_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -152,6 +154,7 @@ namespace FPJ0000 btMailAddr.Enabled = btPart.Enabled; btPath.Enabled = btPart.Enabled; btSendMail.Enabled = btPart.Enabled; + //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); @@ -164,6 +167,8 @@ namespace FPJ0000 tbPath.ReadOnly = true; } + btSave.Enabled = EditMode; + } void UpdateUserList() { diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index 7dbd4b3..f62d017 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -201,6 +201,12 @@ 100, 17 + + 100, 17 + + + 17, 17 + 17, 17 @@ -356,24 +362,51 @@ 449, 17 + + 449, 17 + + + False + 676, 56 + + 676, 56 + + + 17, 56 + 17, 56 537, 56 + + 537, 56 + + + 398, 56 + 398, 56 259, 56 + + 259, 56 + 120, 56 + + 120, 56 + + + 566, 17 + 566, 17 @@ -456,6 +489,12 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + 922, 17 + + + 722, 17 + 722, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index e3f7253..97171ed 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -61,6 +61,7 @@ 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(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -112,7 +113,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(); @@ -186,13 +186,13 @@ 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(); ((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(); @@ -203,6 +203,7 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -657,260 +658,7 @@ this.fpSpread1.Size = new System.Drawing.Size(1585, 520); this.fpSpread1.StatusBarVisible = true; 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 = 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; + this.fpSpread1.SetViewportLeftColumn(0, 0, 7); // // toolStrip1 // @@ -1831,6 +1579,269 @@ 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 = 32; + 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 = 4; + 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.Cells.Get(1, 31).Value = "자스민"; + 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; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(31).DataField = "jasmin"; + this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(31).Label = "자스민"; + this.fpSpread1_Sheet1.Columns.Get(31).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; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1852,7 +1863,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); @@ -1866,6 +1876,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1985,7 +1996,6 @@ private System.Windows.Forms.Label label17; 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; @@ -1998,5 +2008,6 @@ private System.Windows.Forms.Label label25; private System.Windows.Forms.Label label27; private System.Windows.Forms.Label label28; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index e268e3a..06f9bef 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -181,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,kdate" + + "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin" + " 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 "; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 39e2cde..c1b386e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3ZTh5qMigpL15TLXClrrcWoLLd0MjVtaUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiIjpsBGKzvoR9cwMmBN9Ayrx6JYwn9Y1Fd3+jSYt/DCMyuMHoehEEl07+Qq3q6lRMzEhh39Huu - lzrlbYHBo4N+VIsTrkbys870DGJGQq/7K5kPzF8G478E8+wFUMhBMBy6OLdmgWkkTObZUBZPCNkSDAfP - +yQFVRaFqoLZhbJuOdQ9Comfsk4Exa4M4XgamjPTKwVVllKVki7hmkea0D7WjPKzO0hQYHA8mCmwT4Vg - nwzCORPE2y8J7O2cJAXq/lKVgt7Oae/WY4+pHMWtBZC3bcGQNwSroAn27w1ef4qjos0LFbOzsoyWc43O - OsjoQq6IzttmvLWIeGoZtimWeO38lxSQLfgNbLxqrAeg7C1B9bV9OOo4jM30Bm4jvX6rsFG77QNiyWU4 - plncnsmIGn7CIpFafVnNlUro3VocsdegmC7g8psyYYGWoXdY+vYTd3yZDe7P8ofkfMwiW+puJWQdhSjS - 5yH/+LqVsIDu+gIpGOaDQpgU3OAfIpsXgRg0Ru+ad6C9+hJRvsD1NEy8bj9fIARytanT/VvMSGhgniOS - +AE2lsbnSAoBNglqt8GDXMka7tnFjIRj5vnx2i5/srZrDtXnfNh/evVe/hGK+gNuQCyHispgyQAAAABJ + SKESs3ZzDTUZFRWWrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G5PyItltBGG3voe+fx8m+N9Ayrx6LYwm9IzFdz/DiQs+jKCzuCLoeRkAl07+Qq3rawIkZCYwn9j3X + S532GWD06qAf1uKEu5H8rDM/g5iR0O35SuZ9c1fABC7DMnMRFHIQDIcuza5ZYB6KkHk2lNUbRrYEw8EL + fklBlVWhqmB2oaxTDnWXQuKnbGMhsStDJJGG5uzkSkGVtVSlpEu45qEmtI40o/zcDhIU6B8NZQocE2E4 + xkNwTYXw9ssS9raPkwJ1b6lKQW/ntPfqscdcjuJTBZC3bMGALwyboDH27w1ef0qgosUHFbOzsoyWc42u + OsjoQq6Izttmur2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7C5B9fV9OOo8jM30Bm4jvX6rsFGr/QPiyWU4 + J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgKGgXdY/PYTd/2ZDR7M8IfkmmaRLXWnErK2QhTp + 85B/fN1KWEB3Y54UDPJBIUwKbvIPkc2LYBwak2/NO9Bee4kYX+B+GiFeT4AvEAK52tTu+S1mJDQwzxFd + +gE2nsbnaApBNglqt9GLXMka7jvEjIRjlrnR2o5AsrZjFtXn/dh/ZvVe/hGK+gNqySyGpT2aqgAAAABJ RU5ErkJggg== diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 02ccf9d..4f09a33 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1035,6 +1035,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnkdate; + private global::System.Data.DataColumn columnjasmin; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1669,6 +1671,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 jasminColumn { + get { + return this.columnjasmin; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1779,7 +1789,8 @@ namespace FPJ0000 { string ReqPackage, string ReqPlant, int pno, - string kdate) { + string kdate, + int jasmin) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1855,7 +1866,8 @@ namespace FPJ0000 { ReqPackage, ReqPlant, pno, - kdate}; + kdate, + jasmin}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1935,7 +1947,8 @@ namespace FPJ0000 { string ReqPackage, string ReqPlant, int pno, - string kdate) { + string kdate, + int jasmin) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2011,7 +2024,8 @@ namespace FPJ0000 { ReqPackage, ReqPlant, pno, - kdate}; + kdate, + jasmin}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2115,6 +2129,7 @@ namespace FPJ0000 { this.columnReqPlant = base.Columns["ReqPlant"]; this.columnpno = base.Columns["pno"]; this.columnkdate = base.Columns["kdate"]; + this.columnjasmin = base.Columns["jasmin"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2268,6 +2283,8 @@ namespace FPJ0000 { 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.columnjasmin = new global::System.Data.DataColumn("jasmin", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnjasmin); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -13029,6 +13046,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int jasmin { + get { + if (this.IsjasminNull()) { + return -1; + } + else { + return ((int)(this[this.tableProjects.jasminColumn])); + } + } + set { + this[this.tableProjects.jasminColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -13868,6 +13901,18 @@ namespace FPJ0000 { public void SetkdateNull() { this[this.tableProjects.kdateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsjasminNull() { + return this.IsNull(this.tableProjects.jasminColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetjasminNull() { + this[this.tableProjects.jasminColumn] = global::System.Convert.DBNull; + } } /// @@ -23172,6 +23217,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("ReqPlant", "ReqPlant"); tableMapping.ColumnMappings.Add("pno", "pno"); tableMapping.ColumnMappings.Add("kdate", "kdate"); + tableMapping.ColumnMappings.Add("jasmin", "jasmin"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -23188,28 +23234,29 @@ 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], [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)"; + "pno], [kdate], [jasmin]) VALUES (@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, @ddat" + + "e, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @categ" + + "ory, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @" + + "bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @champio" + + "nid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @R" + + "eqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin);\r\nSELECT idx, status, pda" + + "te, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, r" + + "ev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, rema" + + "rk_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLa" + + "stHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP" + + "_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getSchedule" + + "ProgressI(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(champ" + + "ionid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserNa" + + "me(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.g" + + "etUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPack" + + "age, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = SCOPE_IDENTITY()) O" + + "RDER 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, "", "", "")); @@ -23270,6 +23317,7 @@ namespace FPJ0000.dsPRJTableAdapters { 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", 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" + @@ -23287,22 +23335,23 @@ 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, 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)"; + "eqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmi" + + "n = @jasmin\r\nWHERE (idx = @Original_idx); \r\nSELECT idx, status, pdate, name, us" + + "ermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, us" + + "erManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddat" + + "e, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(id" + + "x) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description" + + ", CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(id" + + "x) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bd" + + "ate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrat" + + "e, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS na" + + "me_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyi" + + "d) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(s" + + "oftwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlan" + + "t, pno, kdate, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [stat" + + "us] = \'검토\' 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, "", "", "")); @@ -23363,6 +23412,7 @@ namespace FPJ0000.dsPRJTableAdapters { 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("@jasmin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", 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, "", "", "")); } @@ -23385,7 +23435,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, kdate + ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -23408,7 +23458,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, kdate + ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -23420,7 +23470,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, kdate + ReqPackage, ReqPlant, pno, kdate, jasmin 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 @@ -23686,7 +23736,8 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string ReqPackage, string ReqPlant, global::System.Nullable pno, - string kdate) { + string kdate, + global::System.Nullable jasmin) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -24036,6 +24087,12 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.InsertCommand.Parameters[58].Value = ((string)(kdate)); } + if ((jasmin.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[59].Value = ((int)(jasmin.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[59].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -24116,6 +24173,7 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string ReqPlant, global::System.Nullable pno, string kdate, + global::System.Nullable jasmin, int Original_idx, int idx) { if ((status == null)) { @@ -24467,8 +24525,14 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = 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)); + if ((jasmin.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[59].Value = ((int)(jasmin.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[61].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 2c3a015..a7b94b7 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], [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) + 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], [jasmin]) 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, @jasmin); +SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = 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) @@ -83,6 +83,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -93,7 +94,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, kdate + ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -116,9 +117,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, kdate = @kdate + userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin WHERE (idx = @Original_idx); -SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate 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, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -179,6 +180,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -259,6 +261,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -286,7 +289,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, kdate + ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = @idx) @@ -303,7 +306,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, kdate + ReqPackage, ReqPlant, pno, kdate, jasmin 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 @@ -3435,13 +3438,14 @@ WHERE (idx = @idx) - + +