diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 031ecb8..a037f59 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.03.29.2350")] -[assembly: AssemblyFileVersion("21.03.29.2350")] +[assembly: AssemblyVersion("21.04.05.1120")] +[assembly: AssemblyFileVersion("21.04.05.1120")] diff --git a/SubProject/FPJ0000/EboardDailyform.xlsx b/SubProject/FPJ0000/EboardDailyform.xlsx index 463bed8..cd1f4d9 100644 Binary files a/SubProject/FPJ0000/EboardDailyform.xlsx and b/SubProject/FPJ0000/EboardDailyform.xlsx differ diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index d2e2c86..b92ba84 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -98,7 +98,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(); @@ -160,13 +159,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(); @@ -176,6 +175,7 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -606,178 +606,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 = 19; - 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).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - 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(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; - 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; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 78F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 59F; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -1065,7 +893,7 @@ this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(74, 24); this.label5.TabIndex = 0; - this.label5.Text = "End"; + this.label5.Text = "End(ww)"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label5, "완료일"); // @@ -1078,7 +906,7 @@ this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(74, 24); this.label9.TabIndex = 0; - this.label9.Text = "Due"; + this.label9.Text = "Due(ww)"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label9, "예상완료일"); // @@ -1091,7 +919,7 @@ this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(74, 24); this.label3.TabIndex = 0; - this.label3.Text = "Out"; + this.label3.Text = "Out(ww)"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.toolTip1.SetToolTip(this.label3, "출고일(프로그램의 경우 설치일)"); // @@ -1108,7 +936,7 @@ // // label8 // - this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); + this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwd", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Location = new System.Drawing.Point(420, 1); this.label8.Name = "label8"; @@ -1119,7 +947,7 @@ // // label10 // - this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); + this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwo", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Location = new System.Drawing.Point(755, 1); this.label10.Name = "label10"; @@ -1130,7 +958,7 @@ // // label12 // - this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); + this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwe", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label12.Location = new System.Drawing.Point(1090, 1); @@ -1511,6 +1339,193 @@ 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 = 19; + 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).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + 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 = 63F; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "wwe"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; + 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; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; + 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 = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; + numberCellType4.MaximumValue = 999999999999999D; + numberCellType4.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + 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; @@ -1532,7 +1547,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); @@ -1545,6 +1559,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index b58a6d7..5996948 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -147,7 +147,7 @@ namespace FPJ0000 // var orgQuery = this.ta.Adapter.SelectCommand.CommandText; - 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 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 "; if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index fc1bf57..281f006 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iL0lIJXKQt2mzT - 1ZqrqWtnARpDMvqyapYSusukdEREY5UlpDDUVNLI9dW+YF/gCAQiKFv3dHfclCN/qtf27LZ7P8+z9z57 - E/+N0fERhltB6KzvoR1cwPGBNyCpV4+FsYj+sZi6b3Rpse9RFGZXBD0PIyBSmV/IV9NpLyNkRFDu2Pd8 - L3HS1w6dRw3tKIljrhb+Z6PpGYSMiF73V34+MH8FVOAyzLMXQSAPznDg0tyaBaaRCD/PhbB4wsgVZ9h/ - wS8qqLXIFNXUDlR2S6HskYn8hHU8JHRliSQyUJ2dWimotVQo5KfKmbaRVnSMtaHqXBkf5Bj0hrIF9skw - 7BMhOKdDePslid2dE3yBsr9CITNsY8h7TdhlqkLpiSJI9Zsx5AvDymmc/nuD158SqNb7oKC211TqpUyL - sxESTTFToinYary9iER6GbZJmvfa2S9fwG/BbmBjVW/dB3lvOequ78Fhx0Fs0mxgNmrWb+E26rB9QDy1 - DMcUjTvTWRHDT2gk06svq7paA62bxCF7PUo1RUxhazbM0T70DkvffuKuP7vBg1n2kJwzNHKl7JZDYihG - ibYAhUfXrYQ51DcW+IJhNsiF+YKb7EPk8iIYh8roW/MOyGsvEWMLXE8jvNcdYAu4QL7KOt2/hYyIZuo5 - oskfoOMZfI6mEaRTIHbqPMiXpPm+XciIOGKe9zZ0BVINXXOoO+/H3jOr9/KPEMQfxQUs/XWpP8sAAAAA + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/SxNxHMbvPwoClVIkFrnKUtcmLY0WGChF + SKESs/ZFx1wyKiosXVMuc6WstRajstylk6lpS5vSV/sy+7Ld2tzW2sronu5uh+6WP9ULHg7u/TwPbz68 + if/G7PoI060gDPb30A0u4tTAG6jJV4+FsYj+sZimb3R5qe9RFFZPBD0PIyBSmV/IV5OJYoSMCJKKfc/3 + Eqd9bTB4NdCNqnHS08L/bLTMQ8iI6KW+8vOBhSsgA5dhnb0IAnlwhsOX5tYtsIxE+HkuhM0bRq44w6EL + flFBrU2mqCZ3o7JbCmWPTOQn7BMhoStLJJGB6uz0akGtrUIhN5Yz+pFWdIzpUXVuJx/kGBwPZQucU2E4 + J0Nwz4Tw9ksS+zon+QJlf4VC1r6DUd9rwl5LFUrbiyA1bsWQLww7pwn67w1ef0qg2uiDgtxVU6mXMi3u + Rki0xUyJtmC7+fYSEukVOKZo3utkv3wBvwW7gYNVvf0g5L3lqLu+H8dcR7BFu4nZrN1Yxm3U4fiAeGoF + rmkad2ayIoaf0kim115WdbUGOkqNo856lGqLmMLWbJijbegdlr/9xF1/doMHs+whuZ/QyJWyWw6JqRgl + ugIUntiwGubQ3FjkC4bZIBfmC26yD5HLi2AcKrNv3TtQX3uJGFvgeRbhvVSALeAC+drWSf0WMiKayeeI + Jn+AjmfwOZpGkE6B2GPwIl+S5vtOISPiuHVhvKErkGromkPdeT8OnFm7l3+EIP4Afqss34NUdTAAAAAA SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ8SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKFHcsTEzcKCtD - 4sJE4wZMNJiwcAESw0sTDBTFIMEIyFtUioTWEIKBtoClSEccSlunpVRagSkznUen0znellFwYeLj5J7M - 3Mn9zv//d6j/1spYwVJw9IIaspQc8EV1bfyM3/fyxGH/YEHOL35XkDM1VXzIwClqvtuk6HoagE5Wxnvv - KTmG8FRZct1xWfnhiOumHHRUBJk3py4ZOEXRrwrjuiZDCTdBDDRDZJ9BCg5DT3EkKwFdE4h39/apHXDb - sSQzYqINnKK8vSf5tLpL4FYkfGbwn2qwPV+G2MINcJ5acMt3wS3dwY67kriCdBaFd+S0YOAkYKhQTUmb - 4OhW7Cw2IDp9G1J0jlTljeqZZ/xnB5nx3EP5soFnOihSs/OnFWIJ0MQsqEkMlMgj0PQALHYnOidZ9M1s - wOYOwdldpBg4CWg1JXVNgsY7keKsULeGkdzsgLz+AJ7lboy5olj7KuLLloI5P4+JpW8YtbRpBk7+QrtJ - Sas81G0LktGebFU5VAspUIlBewQrYQHzrAR7QMQssSeioP89CwOnKPfDfFlXOQI/h7LRDDlYQ+AKiN5r - 2bZ9MQV2fwIzvgQmGQGukIKe6fB+wGpjXkSK0/Gwqy+dWOuE4H0MgWmC8LkO/WTmlQ0R0949OOMP6wra - x1f3A5i63FtMw/Feuv5YzN2QJx/021dPtDkfj0UCOVgZC6S65aOARnOXbq06e8WI+L1arOyRdhtbPUTu - YmA2gqc2d7re3Kt7JjrgNJfyL8pzS42jf67XVeevO9qucgFrC8bvFYvG579TV/nR0onqc5Ltfsn+Xfyb - KOo7Ogkkq+WJUZcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ + Eg8mGi9gosGEgwcQFURNZnioCSIGQd6CMiRshhAMbAOEIatYxja6MSadQEe7PtZ1/frfqKImJj6+6Td9 + 5P/5/h6l/luLQwXzocHTWvgXLw8fD/hfHtob6CnI+clvC3LGxor2mDhFudssqmGkARjkynjnOaXEEBkr + Sa66zqnfHJ29ooRcZSHm9ZGzJk5R9EBh3NAVqBErpGAdJPYZ5FAfjBRPshIwdJF4e+c9tYUYxyWZfgtt + 4hTl6zgspLVtAjci4W+A8LEKm9MliM1cBu+tBr9wA/z8dWx5yonLSGccfP1HRRMnAb2FWkpeB083Ymuu + Ftz4NcjcFKkqmNUz9/j3DjLjeXrzFRPPdHBMy86fVollQJeyoC4zUKMPQdPdsDndaBll0TmxBocnjMze + TJwENFqShi5DF9xI8XZoG31IrjdDWb0P70IbhmY5LH+WsLKhYiogYGT+CwZt9bqJk7/QZFHTmgBt04Yk + 156tqoSrIQfL0eOMYjEiYpqV4QxKmCT2RlV0vWNh4hTleZCvGBpP4Faoa3VQQlUELoPku5ht2x9T4Qwk + MOFPYJQRMRtW0T4e2Q1YupsXleN0fMXdmU4st0D0PYLIWCF+qkEXmXlxTcK4bwfO+P2qiqbhpd0Apib3 + KlN7sIO+cyDmqc1TfvSbgQZ9yi9gjkAuVsEMqW77IOK29alhrzhx3oz4vert7L4mB1vZS3bRPRnFE8d0 + +qa11fCONMPdUCy8KM0tNo/+uV5VnLrkenyBD9rrMXyrSDI//52el+4vHqk8KTvundndxb+Jor4Cf2wk + UEWj3CsAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs index 811ab40..8ec5318 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs @@ -34,12 +34,12 @@ namespace FPJ0000 cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다 //일단 나만 보이게 함 - tbRequest.Text = FCOMMON.info.Login.nameK; + tbRequest.Text = string.Empty;// FCOMMON.info.Login.nameK; - this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01"); + this.dtSD.Text = DateTime.Now.ToString("yyyy-01-01"); //1년치로 본다 210405 var sdate = DateTime.Parse(dtSD.Text); - this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString(); + this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString(); refreshData(); diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 8befb3a..3888518 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -911,6 +911,14 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnProgressPrj; + private global::System.Data.DataColumn columnwws; + + private global::System.Data.DataColumn columnwwo; + + private global::System.Data.DataColumn columnwwe; + + private global::System.Data.DataColumn columnwwd; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1329,6 +1337,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wwsColumn { + get { + return this.columnwws; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wwoColumn { + get { + return this.columnwwo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wweColumn { + get { + return this.columnwwe; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn wwdColumn { + get { + return this.columnwwd; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1412,7 +1452,11 @@ namespace FPJ0000 { bool bFanOut, string div, string crdue, - double ProgressPrj) { + int ProgressPrj, + string wws, + string wwo, + string wwe, + string wwd) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1461,7 +1505,11 @@ namespace FPJ0000 { bFanOut, div, crdue, - ProgressPrj}; + ProgressPrj, + wws, + wwo, + wwe, + wwd}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1514,7 +1562,11 @@ namespace FPJ0000 { bool bFanOut, string div, string crdue, - double ProgressPrj) { + int ProgressPrj, + string wws, + string wwo, + string wwe, + string wwd) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1563,7 +1615,11 @@ namespace FPJ0000 { bFanOut, div, crdue, - ProgressPrj}; + ProgressPrj, + wws, + wwo, + wwe, + wwd}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1640,6 +1696,10 @@ namespace FPJ0000 { this.columndiv = base.Columns["div"]; this.columncrdue = base.Columns["crdue"]; this.columnProgressPrj = base.Columns["ProgressPrj"]; + this.columnwws = base.Columns["wws"]; + this.columnwwo = base.Columns["wwo"]; + this.columnwwe = base.Columns["wwe"]; + this.columnwwd = base.Columns["wwd"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1737,8 +1797,16 @@ namespace FPJ0000 { base.Columns.Add(this.columndiv); this.columncrdue = new global::System.Data.DataColumn("crdue", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columncrdue); - this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(double), null, global::System.Data.MappingType.Element); + this.columnProgressPrj = new global::System.Data.DataColumn("ProgressPrj", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnProgressPrj); + this.columnwws = new global::System.Data.DataColumn("wws", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwws); + this.columnwwo = new global::System.Data.DataColumn("wwo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwwo); + this.columnwwe = new global::System.Data.DataColumn("wwe", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwwe); + this.columnwwd = new global::System.Data.DataColumn("wwd", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnwwd); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1784,6 +1852,14 @@ namespace FPJ0000 { this.columndiv.MaxLength = 2; this.columncrdue.MaxLength = 10; this.columnProgressPrj.ReadOnly = true; + this.columnwws.ReadOnly = true; + this.columnwws.MaxLength = 6; + this.columnwwo.ReadOnly = true; + this.columnwwo.MaxLength = 6; + this.columnwwe.ReadOnly = true; + this.columnwwe.MaxLength = 6; + this.columnwwd.ReadOnly = true; + this.columnwwd.MaxLength = 6; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10840,10 +10916,10 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public double ProgressPrj { + public int ProgressPrj { get { try { - return ((double)(this[this.tableProjects.ProgressPrjColumn])); + return ((int)(this[this.tableProjects.ProgressPrjColumn])); } catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("\'Projects\' 테이블의 \'ProgressPrj\' 열의 값이 DBNull입니다.", e); @@ -10854,6 +10930,70 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string wws { + get { + if (this.IswwsNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.wwsColumn])); + } + } + set { + this[this.tableProjects.wwsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string wwo { + get { + if (this.IswwoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.wwoColumn])); + } + } + set { + this[this.tableProjects.wwoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string wwe { + get { + if (this.IswweNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.wweColumn])); + } + } + set { + this[this.tableProjects.wweColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string wwd { + get { + if (this.IswwdNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.wwdColumn])); + } + } + set { + this[this.tableProjects.wwdColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -11369,6 +11509,54 @@ namespace FPJ0000 { public void SetProgressPrjNull() { this[this.tableProjects.ProgressPrjColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswwsNull() { + return this.IsNull(this.tableProjects.wwsColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwwsNull() { + this[this.tableProjects.wwsColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswwoNull() { + return this.IsNull(this.tableProjects.wwoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwwoNull() { + this[this.tableProjects.wwoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswweNull() { + return this.IsNull(this.tableProjects.wweColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwweNull() { + this[this.tableProjects.wweColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IswwdNull() { + return this.IsNull(this.tableProjects.wwdColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetwwdNull() { + this[this.tableProjects.wwdColumn] = global::System.Convert.DBNull; + } } /// @@ -19412,6 +19600,10 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("div", "div"); tableMapping.ColumnMappings.Add("crdue", "crdue"); tableMapping.ColumnMappings.Add("ProgressPrj", "ProgressPrj"); + tableMapping.ColumnMappings.Add("wws", "wws"); + tableMapping.ColumnMappings.Add("wwo", "wwo"); + tableMapping.ColumnMappings.Add("wwe", "wwe"); + tableMapping.ColumnMappings.Add("wwd", "wwd"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -19566,7 +19758,8 @@ namespace FPJ0000.dsPRJTableAdapters { this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"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.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -19586,7 +19779,8 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -19595,7 +19789,8 @@ WHERE (idx = @idx)"; this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"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, dbo.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd 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 diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 69231f5..6624eeb 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -11,11 +11,11 @@ - + DELETE FROM Projects WHERE (idx = @Original_idx) - + @@ -73,7 +73,8 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat 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.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -88,7 +89,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN - + UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, @@ -98,50 +99,50 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, WHERE (idx = @Original_idx); SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue 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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -193,6 +194,10 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + + + + @@ -217,7 +222,8 @@ WHERE (import = 1) AND (gcode = @gcode) SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd FROM Projects WHERE (idx = @idx) @@ -231,7 +237,8 @@ WHERE (idx = @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, dbo.getScheduleProgress(idx) AS ProgressPrj + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, + dbo.getWorkWeek(ddate) AS wwd 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 @@ -243,7 +250,7 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = - + UPDATE Projects @@ -2820,7 +2827,35 @@ WHERE (idx = @idx) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 3915187..f0ae45c 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - +