From 1c74f81479c6f57e1f8264c2e917de180dfd0d58 Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 14 Jan 2025 16:25:43 +0900 Subject: [PATCH] .. --- .../FPJ0000/Project/fProjectList.Designer.cs | 253 +++++++++--------- SubProject/FPJ0000/Project/fProjectList.cs | 2 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 105 +++++++- SubProject/FPJ0000/dsPRJ.xsd | 31 ++- SubProject/FPJ0000/dsPRJ.xss | 20 +- 5 files changed, 264 insertions(+), 147 deletions(-) diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index a514557..4717e0c 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -54,6 +54,7 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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(); @@ -64,7 +65,7 @@ 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.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); @@ -337,6 +338,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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -459,6 +461,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -706,7 +709,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 39; + this.fpSpread1_Sheet1.ColumnCount = 40; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -720,31 +723,31 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).ColumnSpan = 8; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "Basic Info"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "Process /\r\nEquipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).ColumnSpan = 8; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).ColumnSpan = 9; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Schedule"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "Schedule"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).ColumnSpan = 5; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 24).Value = "Budget"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Human Resource"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 29).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).ColumnSpan = 5; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Effect"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Budget"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Human Resource"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).ColumnSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 30).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Ext.Info"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 35).Value = "Cost Save"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "Ext.Info"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Fan Out"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Cost Save"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "High\r\nLight"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "Fan Out"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "Major\r\nItem"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "High\r\nLight"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 39).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 39).Value = "Major\r\nItem"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Project\r\nNo"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Process / Equipment"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "Site"; @@ -761,25 +764,26 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Start Date"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Due Date"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "Done Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Q\'ty"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "Outsourced Cost ($K)/Set\r\n"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "In-house Cost ($K/Set)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "Cost Save ($k)/Set"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "SFI"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "Champion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Design"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "ePanel"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "History"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "Memo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "Asset"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "자스민"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 35).Value = "Cost\r\nSave"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 36).Value = "Fan\r\nOut"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "High\r\nLight"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Ver"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "Q\'ty"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "SFI"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Champion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Design"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "ePanel"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "History"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 31).Value = "Memo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Asset"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 35).Value = "자스민"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 36).Value = "Cost\r\nSave"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "Fan\r\nOut"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 38).Value = "High\r\nLight"; 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))))); @@ -894,122 +898,131 @@ numberCellType5.MaximumValue = 2147483647D; numberCellType5.MinimumValue = -2147483648D; this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "lastSchNo"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty"; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "Ver"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; + numberCellType6.DecimalPlaces = 0; + numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType6.MaximumValue = 2147483647D; + numberCellType6.MinimumValue = -2147483648D; this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "Q\'ty"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 42F; numberCellType7.MaximumValue = 999999999999999D; numberCellType7.MinimumValue = -999999999999999D; this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "Outsourced Cost ($K)/Set\r\n"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(22).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(22).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "In-house Cost ($K/Set)"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); numberCellType9.MaximumValue = 999999999999999D; numberCellType9.MinimumValue = -999999999999999D; this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfic"; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(23).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI"; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "Cost Save ($k)/Set"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; - 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(23).Width = 67F; + numberCellType10.MaximumValue = 999999999999999D; + numberCellType10.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "sfic"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "SFI"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "SCR/CF"; this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software"; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_champion"; + this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "Champion"; + this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design"; - this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design"; - this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_software"; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel"; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory"; - this.fpSpread1_Sheet1.Columns.Get(29).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22; - this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23; - this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset"; - this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24; - this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(29).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "ePanel"; + this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "lasthistory"; + this.fpSpread1_Sheet1.Columns.Get(30).Label = "History"; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(31).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(31).Label = "Memo"; + this.fpSpread1_Sheet1.Columns.Get(31).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(32).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#"; + this.fpSpread1_Sheet1.Columns.Get(32).Label = "Asset"; this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25; - this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(33).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#"; + this.fpSpread1_Sheet1.Columns.Get(33).Label = "Model#"; this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin"; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(34).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민"; + this.fpSpread1_Sheet1.Columns.Get(34).Label = "Serial#"; this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(35).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost"; - this.fpSpread1_Sheet1.Columns.Get(35).Label = "Cost\r\nSave"; - this.fpSpread1_Sheet1.Columns.Get(35).Tag = "costsave"; - this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F; + numberCellType11.DecimalPlaces = 0; + numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType11.MaximumValue = 2147483647D; + numberCellType11.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(35).DataField = "jasmin"; + this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(35).Label = "자스민"; + this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut"; - this.fpSpread1_Sheet1.Columns.Get(36).Label = "Fan\r\nOut"; + this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bCost"; + this.fpSpread1_Sheet1.Columns.Get(36).Label = "Cost\r\nSave"; + this.fpSpread1_Sheet1.Columns.Get(36).Tag = "costsave"; this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F; this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3; - this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight"; - this.fpSpread1_Sheet1.Columns.Get(37).Label = "High\r\nLight"; - this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight"; - this.fpSpread1_Sheet1.Columns.Get(37).Width = 39F; + this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bFanOut"; + this.fpSpread1_Sheet1.Columns.Get(37).Label = "Fan\r\nOut"; + this.fpSpread1_Sheet1.Columns.Get(37).Width = 44F; this.fpSpread1_Sheet1.Columns.Get(38).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType4; - this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bmajoritem"; - this.fpSpread1_Sheet1.Columns.Get(38).Tag = "majoritem"; + this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bHighlight"; + this.fpSpread1_Sheet1.Columns.Get(38).Label = "High\r\nLight"; + this.fpSpread1_Sheet1.Columns.Get(38).Tag = "Highlight"; + this.fpSpread1_Sheet1.Columns.Get(38).Width = 39F; + this.fpSpread1_Sheet1.Columns.Get(39).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(39).CellType = checkBoxCellType4; + this.fpSpread1_Sheet1.Columns.Get(39).DataField = "bmajoritem"; + this.fpSpread1_Sheet1.Columns.Get(39).Tag = "majoritem"; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index c0848ea..ccaf83f 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -224,7 +224,7 @@ namespace FPJ0000 "dbo.getUserName2(epanelid,userhw2) as name_epanel," + "dbo.getUserName2(softwareid,usersub) as name_software,category," + "ReqLine,ReqSite,ReqPackage,ReqPlant,pno,kdate,jasmin,sfi,'' AS lasthistoryD," + - "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date" + + "(select max(pdate) from ProjectsHistory where pidx = Projects.idx) as lasthistory_date,dbo.getLastProjectScheduleNo(gcode,idx) as lastSchNo" + " 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/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index f8b4c01..419fe7f 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1135,6 +1135,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnbmajoritem; + private global::System.Data.DataColumn columnlastSchNo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public ProjectsDataTable() : @@ -1889,6 +1891,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn lastSchNoColumn { + get { + return this.columnlastSchNo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2014,7 +2024,8 @@ namespace FPJ0000 { double sfi_savecount, double sfi_shiftcount, double sfic, - bool bmajoritem) { + bool bmajoritem, + int lastSchNo) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2105,7 +2116,8 @@ namespace FPJ0000 { sfi_savecount, sfi_shiftcount, sfic, - bmajoritem}; + bmajoritem, + lastSchNo}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2200,7 +2212,8 @@ namespace FPJ0000 { double sfi_savecount, double sfi_shiftcount, double sfic, - bool bmajoritem) { + bool bmajoritem, + int lastSchNo) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2291,7 +2304,8 @@ namespace FPJ0000 { sfi_savecount, sfi_shiftcount, sfic, - bmajoritem}; + bmajoritem, + lastSchNo}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2410,6 +2424,7 @@ namespace FPJ0000 { this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"]; this.columnsfic = base.Columns["sfic"]; this.columnbmajoritem = base.Columns["bmajoritem"]; + this.columnlastSchNo = base.Columns["lastSchNo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2593,6 +2608,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnsfic); this.columnbmajoritem = new global::System.Data.DataColumn("bmajoritem", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnbmajoritem); + this.columnlastSchNo = new global::System.Data.DataColumn("lastSchNo", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnlastSchNo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2680,6 +2697,7 @@ namespace FPJ0000 { this.columnlasthistory_date.ReadOnly = true; this.columnlasthistory_date.MaxLength = 10; this.columnsfi_type.MaxLength = 1; + this.columnlastSchNo.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14365,6 +14383,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int lastSchNo { + get { + try { + return ((int)(this[this.tableProjects.lastSchNoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'lastSchNo\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableProjects.lastSchNoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { @@ -15384,6 +15418,18 @@ namespace FPJ0000 { public void SetbmajoritemNull() { this[this.tableProjects.bmajoritemColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IslastSchNoNull() { + return this.IsNull(this.tableProjects.lastSchNoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetlastSchNoNull() { + this[this.tableProjects.lastSchNoColumn] = global::System.Convert.DBNull; + } } /// @@ -25133,6 +25179,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount"); tableMapping.ColumnMappings.Add("sfic", "sfic"); tableMapping.ColumnMappings.Add("bmajoritem", "bmajoritem"); + tableMapping.ColumnMappings.Add("lastSchNo", "lastSchNo"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -25373,13 +25420,14 @@ namespace FPJ0000.dsPRJTableAdapters { "yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n " + " (SELECT MAX(pdate) AS Expr1\r\n FROM Projects" + "History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " + - "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem\r\nFR" + - "OM Projects WITH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManag" + - "er, \'\') LIKE @username OR\r\n ISNULL(usermain, \'\') LIKE @username OR" + - "\r\n ISNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) " + - "AND (gcode = @gcode)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status" + - "] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'" + - "3\' WHEN ([status] = \'취소\') \r\n THEN \'9\' ELSE \'5\' END)"; + "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, db" + + "o.getLastProjectScheduleNo(gcode, idx) \r\n AS lastSchNo\r\nFROM P" + + "rojects WITH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManager, \'\') " + + "LIKE @username OR\r\n ISNULL(usermain, \'\') LIKE @username OR\r\n " + + " ISNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gco" + + "de = @gcode)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\'" + + ") THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN " + + "([status] = \'취소\') \r\n THEN \'9\' ELSE \'5\' END)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25391,12 +25439,43 @@ namespace FPJ0000.dsPRJTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)"; + this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, + idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo +FROM Projects WITH (nolock) +WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)"; + this._commandCollection[3].CommandText = "SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getSchedulePr" + + "ogressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid," + + " asset, bCost, bFanOut, \r\n bHighlight, bdate, bmajoritem, category" + + ", cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effe" + + "ct_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, \r\n " + + " idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.get" + + "LastHistory(idx) AS lasthistory,\r\n (SELECT MAX(pdate) AS Expr" + + "1\r\n FROM ProjectsHistory\r\n WHERE (pid" + + "x = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserNam" + + "e(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, \r\n" + + " dbo.getUserName(designid) AS name_design, dbo.getUserName(epaneli" + + "d) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno," + + " part, path, pdate, pidx, pno, \r\n process, progress, qdate, remark" + + "_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime" + + ", sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager," + + " \r\n userhw2, usermain, userprocess, usersub, wdate, wuid, \'\' AS ww" + + "d, \'\' AS wwe, \'\' AS wwo, \'\' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS " + + "lastSchNo\r\nFROM Projects WITH (nolock)\r\nWHERE (ISNULL(name, N\'\') LIKE @sear" + + "ch) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR\r\n (ISNULL(i" + + "sdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR\r\n " + + " (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N\'\')" + + " LIKE @search)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index eb0fe46..1441700 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -106,7 +106,8 @@ WHERE (idx = @Original_idx) ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, dbo.getLastProjectScheduleNo(gcode, idx) + AS lastSchNo FROM Projects WITH (nolock) WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -298,6 +299,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -320,7 +322,17 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, + idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo +FROM Projects WITH (nolock) +WHERE (idx = @idx) @@ -330,7 +342,19 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, + bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, + idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, + dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, + process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, + userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo +FROM Projects WITH (nolock) +WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR + (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) @@ -3541,6 +3565,7 @@ WHERE (idx = @idx) + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index b71c4d5..40b9654 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,28 +4,28 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - - + + - - - - + + + +