From 1c52445f76e3ad616301f42e4db4855584ea57db Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 16 Feb 2021 08:31:01 +0900 Subject: [PATCH] .. --- .../FPJ0000/EBoard/fEboardList.Designer.cs | 311 ++++++++---------- SubProject/FPJ0000/EBoard/fEboardList.cs | 49 +-- SubProject/FPJ0000/EBoard/fEboardList.resx | 31 +- SubProject/FPJ0000/FPJ0000.csproj | 9 + .../FPJ0000/JobReport/fJobReport.Designer.cs | 106 +++--- SubProject/FPJ0000/JobReport/fJobReport.cs | 117 +++++-- SubProject/FPJ0000/JobReport/fJobReport.resx | 3 + .../JobReport/fSelectProcess.Designer.cs | 130 ++++++++ .../FPJ0000/JobReport/fSelectProcess.cs | 86 +++++ .../FPJ0000/JobReport/fSelectProcess.resx | 123 +++++++ .../FPJ0000/JobReport/rJobReport.Designer.cs | 24 ++ SubProject/FPJ0000/JobReport/rJobReport.cs | 24 +- SubProject/FPJ0000/JobReport/rJobReport.resx | 9 +- SubProject/FPJ0000/JobReport/rJobReportDay.cs | 3 +- .../FPJ0000/JobReport/rJobReportUser.cs | 4 +- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- .../FPJ0000/Project/fProjectData.Designer.cs | 68 ++-- .../Project/fProjectPartListEdit.Designer.cs | 38 +-- .../FPJ0000/Project/fProjectPartListEdit.resx | 9 +- SubProject/FPJ0000/ReportForUser.xlsx | Bin 20274 -> 20495 bytes SubProject/FPJ0000/dsReport.Designer.cs | 145 +++++++- SubProject/FPJ0000/dsReport.xsd | 42 ++- SubProject/FPJ0000/dsReport.xss | 4 +- 23 files changed, 985 insertions(+), 378 deletions(-) create mode 100644 SubProject/FPJ0000/JobReport/fSelectProcess.Designer.cs create mode 100644 SubProject/FPJ0000/JobReport/fSelectProcess.cs create mode 100644 SubProject/FPJ0000/JobReport/fSelectProcess.resx diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs index 38eccc4..99e7970 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs @@ -30,27 +30,27 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType66 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -96,16 +96,9 @@ this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.cmbYearE = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); - this.cmbCate = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); - this.cmbProcess = new System.Windows.Forms.ToolStripComboBox(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); - this.cmbStat = new System.Windows.Forms.ToolStripComboBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel4 = new System.Windows.Forms.Panel(); this.label11 = new System.Windows.Forms.Label(); @@ -127,6 +120,14 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.chkDelay = new System.Windows.Forms.ToolStripButton(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.tbSd = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.tbSD2 = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -523,11 +524,11 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)"; 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; + numberCellType29.DecimalPlaces = 0; + numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType29.MaximumValue = 2147483647D; + numberCellType29.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29; 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; @@ -535,97 +536,97 @@ 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).CellType = textCellType57; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType58; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE"; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType59; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType60; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType61; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType63; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line"; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType64; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType65; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType66; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType67; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType68; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType69; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; + numberCellType30.DecimalPlaces = 0; + numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType30.MaximumValue = 2147483647D; + numberCellType30.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType30; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; + numberCellType31.MaximumValue = 999999999999999D; + numberCellType31.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType31; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4; + numberCellType32.MaximumValue = 999999999999999D; + numberCellType32.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType32; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5; + numberCellType33.MaximumValue = 999999999999999D; + numberCellType33.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType33; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).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(18).CellType = numberCellType6; + numberCellType34.MaximumValue = 999999999999999D; + numberCellType34.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType34; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]"; @@ -635,11 +636,11 @@ this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F; this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType70; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체"; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; + numberCellType35.MaximumValue = 999999999999999D; + numberCellType35.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType35; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)"; @@ -658,26 +659,27 @@ this.cmbYearS, this.toolStripLabel4, this.cmbYearE, - this.toolStripLabel6, - this.cmbCate, - this.toolStripSeparator2, - this.toolStripLabel7, - this.cmbProcess, this.toolStripSeparator4, this.toolStripLabel3, this.tbRequest, + this.toolStripSeparator2, this.toolStripLabel5, - this.cmbStat}); + this.toolStripLabel7, + this.tbSd, + this.toolStripLabel6, + this.tbSD2, + this.chkDelay, + this.toolStripSeparator3}); this.toolStrip1.Location = new System.Drawing.Point(5, 5); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(991, 25); + this.toolStrip1.Size = new System.Drawing.Size(991, 27); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel2.Size = new System.Drawing.Size(43, 24); this.toolStripLabel2.Text = "입고일"; // // cmbYearS @@ -685,12 +687,12 @@ this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearS.DropDownWidth = 70; this.cmbYearS.Name = "cmbYearS"; - this.cmbYearS.Size = new System.Drawing.Size(100, 25); + this.cmbYearS.Size = new System.Drawing.Size(100, 27); // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); + this.toolStripLabel4.Size = new System.Drawing.Size(15, 24); this.toolStripLabel4.Text = "~"; // // cmbYearE @@ -698,70 +700,17 @@ this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbYearE.DropDownWidth = 70; this.cmbYearE.Name = "cmbYearE"; - this.cmbYearE.Size = new System.Drawing.Size(100, 25); - // - // toolStripLabel6 - // - this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel6.Text = "분류"; - this.toolStripLabel6.Visible = false; - // - // cmbCate - // - this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbCate.Items.AddRange(new object[] { - "---", - "Origin Cost", - "Input Cost", - "Effect Cost", - "Asset No", - "Project", - "Champion", - "Requestor", - "Process"}); - this.cmbCate.Name = "cmbCate"; - this.cmbCate.Size = new System.Drawing.Size(100, 25); - this.cmbCate.Visible = false; - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripLabel7 - // - this.toolStripLabel7.Name = "toolStripLabel7"; - this.toolStripLabel7.Size = new System.Drawing.Size(47, 22); - this.toolStripLabel7.Text = "Process"; - this.toolStripLabel7.Visible = false; - // - // cmbProcess - // - this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbProcess.Items.AddRange(new object[] { - "---", - "Origin Cost", - "Input Cost", - "Effect Cost", - "Asset No", - "Project", - "Champion", - "Requestor", - "Process"}); - this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(100, 25); - this.cmbProcess.Visible = false; + this.cmbYearE.Size = new System.Drawing.Size(100, 27); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27); // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel3.Size = new System.Drawing.Size(43, 24); this.toolStripLabel3.Text = "담당자"; this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // @@ -770,34 +719,10 @@ this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; - this.tbRequest.Size = new System.Drawing.Size(120, 25); + this.tbRequest.Size = new System.Drawing.Size(120, 27); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // - // toolStripLabel5 - // - this.toolStripLabel5.Name = "toolStripLabel5"; - this.toolStripLabel5.Size = new System.Drawing.Size(31, 22); - this.toolStripLabel5.Text = "상태"; - this.toolStripLabel5.Visible = false; - // - // cmbStat - // - this.cmbStat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbStat.Items.AddRange(new object[] { - "---", - "Origin Cost", - "Input Cost", - "Effect Cost", - "Asset No", - "Project", - "Champion", - "Requestor", - "Process"}); - this.cmbStat.Name = "cmbStat"; - this.cmbStat.Size = new System.Drawing.Size(75, 25); - this.cmbStat.Visible = false; - // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 2; @@ -1060,6 +985,61 @@ // this.ta.ClearBeforeFill = true; // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27); + // + // chkDelay + // + this.chkDelay.CheckOnClick = true; + this.chkDelay.Image = global::FPJ0000.Properties.Resources.accept; + this.chkDelay.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chkDelay.Name = "chkDelay"; + this.chkDelay.Size = new System.Drawing.Size(95, 24); + this.chkDelay.Text = "조회시 적용"; + this.chkDelay.Click += new System.EventHandler(this.toolStripButton4_Click); + // + // toolStripLabel5 + // + this.toolStripLabel5.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(116, 24); + this.toolStripLabel5.Text = "* 수리지연품목 조회"; + // + // tbSd + // + this.tbSd.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbSd.Name = "tbSd"; + this.tbSd.Size = new System.Drawing.Size(20, 27); + this.tbSd.Text = "2"; + this.tbSd.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(34, 24); + this.toolStripLabel6.Text = "외주:"; + // + // tbSD2 + // + this.tbSD2.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbSD2.Name = "tbSD2"; + this.tbSD2.Size = new System.Drawing.Size(20, 27); + this.tbSD2.Text = "7"; + this.tbSD2.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripLabel7 + // + this.toolStripLabel7.Name = "toolStripLabel7"; + this.toolStripLabel7.Size = new System.Drawing.Size(34, 24); + this.toolStripLabel7.Text = "일반:"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27); + // // fEboardList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1128,7 +1108,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.ToolStripComboBox cmbYearS; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem 엑셀파일로저장ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; @@ -1148,17 +1127,11 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; - private System.Windows.Forms.ToolStripLabel toolStripLabel6; - private System.Windows.Forms.ToolStripComboBox cmbCate; - private System.Windows.Forms.ToolStripLabel toolStripLabel7; - private System.Windows.Forms.ToolStripComboBox cmbProcess; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button button1; private System.Windows.Forms.Button btSearch; - private System.Windows.Forms.ToolStripLabel toolStripLabel5; - private System.Windows.Forms.ToolStripComboBox cmbStat; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label4; @@ -1171,5 +1144,13 @@ private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripButton toolStripButton3; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel5; + private System.Windows.Forms.ToolStripTextBox tbSd; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripTextBox tbSD2; + private System.Windows.Forms.ToolStripButton chkDelay; + private System.Windows.Forms.ToolStripLabel toolStripLabel7; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 1f0220f..954e227 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -45,22 +45,6 @@ namespace FPJ0000 this.tbRequest.Text = FCOMMON.info.Login.nameK; - //분류 - 190905 - var dt_cate = FCOMMON.DBM.getCodeTable("20"); - cmbCate.Items.Clear(); - cmbCate.Items.Add("--전체--"); - foreach (DataRow dr in dt_cate.Rows) - cmbCate.Items.Add(dr["Value"].ToString()); - cmbCate.SelectedIndex = 0; - - - this.cmbProcess.Items.Clear(); - this.cmbProcess.Items.Add("전체"); - var procesList = FCOMMON.DBM.getProcessList(); - foreach (DataRow dr in procesList.Rows) - cmbProcess.Items.Add(dr["Value"].ToString()); - cmbProcess.Text = FCOMMON.info.Login.process; - if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //this.cmbSort.SelectedIndex = 0; this.cmbYearS.Items.Clear(); @@ -98,6 +82,8 @@ namespace FPJ0000 void refreshData() { + //수리지연추가 210208 - 장은철 + if (this.dsMSSQL.EETGW_JobReport_EBoard.GetChanges() != null) { @@ -111,6 +97,20 @@ namespace FPJ0000 string State_where = " WHERE gcode=@gcode and pdate between "; State_where += "'" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(uid, '')) LIKE @username "; + if (chkDelay.Checked) + { + var 시작일 = DateTime.Now.AddDays(-int.Parse(tbSd.Text)); //일반기간 + var 시작일2 = DateTime.Now.AddDays(-int.Parse(tbSD2.Text)); //외주기간 + State_where += string.Format("and isnull(수리완료일,'') = '' and ((isnull(분류,'') like '%외주%' and pdate <= '{0}') or (isnull(분류,'') not like '%외주%' and pdate <= '{1}'))", 시작일2.ToShortDateString(), 시작일.ToShortDateString()); + tbSd.BackColor = Color.Gold; + tbSD2.BackColor = Color.Gold; + } + else + { + tbSd.BackColor = Color.WhiteSmoke; + tbSD2.BackColor = Color.WhiteSmoke; + } + //if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(분류,'') = '" + cmbCate.Text + "'"; //if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(Process,'') = '" + cmbProcess.Text.Trim() + "'"; string State_order = " ORDER BY pdate desc,uid"; @@ -279,7 +279,8 @@ namespace FPJ0000 var f = new fEboardData(newdr); f.Show(); - f.FormClosed += (s1, e1) => { + f.FormClosed += (s1, e1) => + { if (f.DialogResult == System.Windows.Forms.DialogResult.OK) { this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr); @@ -414,7 +415,8 @@ namespace FPJ0000 var f = new fEboardData(newdr); f.Show(); - f.FormClosed += (s1, e1) => { + f.FormClosed += (s1, e1) => + { if (f.DialogResult == System.Windows.Forms.DialogResult.OK) { this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr); @@ -436,14 +438,15 @@ namespace FPJ0000 var dr = drv.Row as dsPRJ.EETGW_JobReport_EBoardRow; var f = new fEboardData(dr); f.Show(); - f.FormClosed += (s1, e1) => { + f.FormClosed += (s1, e1) => + { if (f.DialogResult == System.Windows.Forms.DialogResult.OK) { this.Validate(); this.bs.EndEdit(); } }; - + } private void 편집ToolStripMenuItem_Click(object sender, EventArgs e) @@ -523,5 +526,11 @@ namespace FPJ0000 newdr.Site = "ATK"; this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr); } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + this.chkDelay.BackColor = chkDelay.Checked ? Color.Lime : SystemColors.Control; + this.refreshData(); + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx index f36a3b8..5126458 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.resx +++ b/SubProject/FPJ0000/EBoard/fEboardList.resx @@ -223,20 +223,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s - ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz - vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud - t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA - 7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx - s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA - lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw - SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O - bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch - 98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec - 1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H - cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss - RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS - dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRLyrzMjWw + m6mUeZtTKm+4iUFmzUXmJbRQoSKSohcVkbdZzcxtTjeckWne8tamA6fTue2coztnfnvO2XAFQT/48Lx4 + zvfD+X3PEfETdVObfrraqEmoMa7EqIw0ORmBWv40MQnV/UzcfcPIMYW+fk/i621C6M+Jvdurt7uYZduy + k3N41uFwB1l28TAYs7lQ1mpBas04JclTbw9E/RNfabDbV1xc/5wXpl8sTBYWxjkWhtkNaH+u48OoB+ss + 0D5Oo+z9L2Q9HKH/kkTf6abXqA0MWjl8tbLkZDEgSDagm1rHp1GKCHwYtHEwLXihUlsQcaP7lRBOrj05 + c1GVuClrPI+shgto+NiMine1iCgPw0mCRHUUUcpDqGuvE1ZxMywWVylElehYQZBUHfG2e7gDHZNP0WCU + C5K0R3GQv0xFfnMKpE1nkNmUifahRXSMuNH2fQ1O0lO0spcRBJJ6yfb4igLOONGDF8NKVGnzBEl6YzwJ + n0Xu4xzopzzCKp8naWhID6seL6Ir+vwCfmIrdUzRswyYpwxoMpXgXlcxkmtPIf1RIsxzFMykWL5g/bS/ + EwcRRCn/EBy/Ve49XLobqfUSDE73Q9VzFUp1EVIeRKJZ24Jv8yzMpNj+WS/6CHaXFxG3A4IDihCZWLEL + +c8v4XJjLC7VxQiSInUqFO9yyJtEgr8ftHAY4D8xwUWKPCw3+AVixY55sWIneSgEYnkIzlVF4tqTDOhH + NVBpSnH1TQakjUkwE4GJ/BtGImC8PogLtMEVTsh7GZuTwdA8J6CbWEDhs1xkk6CsKQXFz69v3fFQGxzC + CzqDgoOFWsbqCAr+h4esEJ7TFhQcKfpCjVkdm/96+F843ZRvX1q7OxAnReZ2zVjWKNfY/KpvZonGjJ3G + VIAlt1eAb97NcFh2enw0TTtDr3T+CMTJCrkfr4VLP3Ttl2kc4bJWZotsP2HZLX6kLUyotHN1b2bn57AM + dZZIJBL9BohloZ6S1+tQAAAAAElFTkSuQmCC @@ -254,6 +254,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 252, 17 diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index f6f00aa..dec1e72 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -215,6 +215,12 @@ fJobReport_AddAI.cs + + Form + + + fSelectProcess.cs + Form @@ -465,6 +471,9 @@ fJobReport_AddAI.cs + + fSelectProcess.cs + rJobChart.cs diff --git a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs index 213f369..359c5ab 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs @@ -30,20 +30,20 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -97,7 +97,8 @@ this.lbTime = new System.Windows.Forms.ToolStripLabel(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.cmbProcess = new System.Windows.Forms.ToolStripComboBox(); + this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); @@ -200,6 +201,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -291,6 +293,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); @@ -526,82 +529,82 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName"; this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F; this.fpSpread1_Sheet1.Columns.Get(9).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(9).CellType = numberCellType1; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3; + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot"; this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -622,7 +625,8 @@ this.lbTime, this.toolStripSeparator2, this.toolStripLabel1, - this.cmbProcess, + this.tbProcess, + this.toolStripButton4, this.toolStripLabel3, this.cmbUser, this.btSearch, @@ -645,6 +649,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -668,6 +673,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -690,13 +696,22 @@ this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); this.toolStripLabel1.Text = "공정"; // - // cmbProcess + // tbProcess // - this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbProcess.Name = "cmbProcess"; - this.cmbProcess.Size = new System.Drawing.Size(150, 37); - this.cmbProcess.SelectedIndexChanged += new System.EventHandler(this.cmbProcess_SelectedIndexChanged); - this.cmbProcess.Click += new System.EventHandler(this.cmbProcess_Click); + this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(200, 37); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.find; + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(34, 34); + this.toolStripButton4.Text = "toolStripButton4"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); // // toolStripLabel3 // @@ -837,12 +852,13 @@ private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripLabel toolStripLabel1; - private System.Windows.Forms.ToolStripComboBox cmbProcess; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.ToolStripButton toolStripButton3; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripSplitButton btSearch; private System.Windows.Forms.ToolStripMenuItem 태그자료만조회ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel4; + private System.Windows.Forms.ToolStripTextBox tbProcess; + private System.Windows.Forms.ToolStripButton toolStripButton4; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index c2ea0b7..5519768 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -39,14 +39,33 @@ namespace FPJ0000 this.cmbUser.Items.Add("-- 전체 --"); var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); - var processStr = "%"; - if (cmbProcess.SelectedIndex > 0) processStr = cmbProcess.Text; - var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); - foreach (dsReport.ProcessUserListRow dr in dtUserList) + var prclist = this.tbProcess.Tag as List; + if (prclist.Count < 1) { - string cmbdata = string.Format("{1}({0})", dr.id, dr.name); - this.cmbUser.Items.Add(cmbdata); + var processStr = "%"; + var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessUserListRow dr in dtUserList) + { + string cmbdata = string.Format("{1}({0})", dr.id, dr.name); + this.cmbUser.Items.Add(cmbdata); + } } + else + { + foreach (var prc in prclist) + { + var processStr = prc;// cmbProcess.Text; + var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessUserListRow dr in dtUserList) + { + string cmbdata = string.Format("{1}({0})", dr.id, dr.name); + this.cmbUser.Items.Add(cmbdata); + } + } + + } + + } private void __Load(object sender, EventArgs e) @@ -55,19 +74,20 @@ namespace FPJ0000 var sdate = DateTime.Parse(dtSD.Text); this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString(); - //공정목록 var taProc = new dsReportTableAdapters.ProcessListTableAdapter(); var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode); - cmbProcess.Items.Clear(); - cmbProcess.Items.Add("--전체--"); - foreach (dsReport.ProcessListRow dr in dtProcList) - { - cmbProcess.Items.Add(dr.processs); - } - cmbProcess.Text = FCOMMON.info.Login.process; - if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함 + //cmbProcess.Items.Clear(); + //cmbProcess.Items.Add("--전체--"); + //foreach (dsReport.ProcessListRow dr in dtProcList) + //{ + // cmbProcess.Items.Add(dr.processs); + //} + //cmbProcess.Text = FCOMMON.info.Login.process; + //if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함 + tbProcess.Text = FCOMMON.info.Login.process; + tbProcess.Tag = new List(new string[] { FCOMMON.info.Login.process }); //담당자목록 - 사용자목록으로 처리한다. @@ -208,15 +228,55 @@ namespace FPJ0000 FCOMMON.Util.MsgE("담당자 번호를 확인할 수 없습니다.(문의 T.8567)"); return; } + string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); request = request.Substring(0, request.Length - 1); - if (cmbUser.SelectedIndex == 0) request = "%"; //전체검색 201028 - chi(임현대) - if (tagonly == false) - this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode); + + //사용자 목록다중선택으로 인해 처리 + var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww"; + sql += " FROM JobReport"; + sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)"; + if (request != "%") + { + //사용자가 지정되어있다 + sql += $" AND uid = '{request}'"; + } else - this.ta.FillByTagOnly(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode); + { + //전체사용자가 지정되어있다. 해당하는 사용자 목록에서만 취한다. + var userlist = new List(); + for (int i = 1; i < cmbUser.Items.Count; i++) //0번요소는 전체이다 + { + var userinfo = cmbUser.Items[i].ToString(); + var userno = userinfo.Substring(userinfo.LastIndexOf('(') + 1); + userno = userno.Substring(0, userno.Length - 1); + userlist.Add(userno); + } + sql += " and uid in ('" + string.Join("','", userlist) + "')"; + } + + if (tagonly) sql += " and isnull(tag,'') <> ''"; + sql += " ORDER BY pdate DESC"; + + var cmd = new System.Data.SqlClient.SqlCommand(sql, ta.Connection); + cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = dtSD.Text; + cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = dtED.Text; + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode; + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + + dsMSSQL.JobReport.Clear(); + da.Fill(this.dsMSSQL.JobReport); + dsMSSQL.JobReport.AcceptChanges(); + + + + + //if (tagonly == false) + // this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode); + //else + // this.ta.FillByTagOnly(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode); RefreshTime(); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); @@ -554,9 +614,9 @@ namespace FPJ0000 private void toolStripButton1_Click(object sender, EventArgs e) { - string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); - request = request.Substring(0, request.Length - 1); - string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('(')); + //string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1); + //request = request.Substring(0, request.Length - 1); + //string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('(')); var f = new JobReport.fJobChartMenu(); f.ShowDialog(); } @@ -588,5 +648,18 @@ namespace FPJ0000 if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; dtED.Text = f.dtPick.SelectionStart.ToShortDateString(); } + + private void toolStripButton4_Click(object sender, EventArgs e) + { + var oldlist = (List)tbProcess.Tag; + var f = new JobReport.fSelectProcess(oldlist.ToArray()); + if (f.ShowDialog() == DialogResult.OK) + { + tbProcess.Tag = f.values; + tbProcess.Text = string.Join(",", f.values); + UpdateUserList(); + } + + } } } diff --git a/SubProject/FPJ0000/JobReport/fJobReport.resx b/SubProject/FPJ0000/JobReport/fJobReport.resx index c22e682..15b94b3 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport/fJobReport.resx @@ -257,6 +257,9 @@ GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + 17, 17 + 325, 17 diff --git a/SubProject/FPJ0000/JobReport/fSelectProcess.Designer.cs b/SubProject/FPJ0000/JobReport/fSelectProcess.Designer.cs new file mode 100644 index 0000000..594b9e4 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fSelectProcess.Designer.cs @@ -0,0 +1,130 @@ + +namespace FPJ0000.JobReport +{ + partial class fSelectProcess + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.cmbProcess = new System.Windows.Forms.CheckedListBox(); + this.button1 = new System.Windows.Forms.Button(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // cmbProcess + // + this.cmbProcess.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.cmbProcess.FormattingEnabled = true; + this.cmbProcess.Location = new System.Drawing.Point(0, 25); + this.cmbProcess.Name = "cmbProcess"; + this.cmbProcess.Size = new System.Drawing.Size(289, 328); + this.cmbProcess.TabIndex = 0; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(0, 353); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(289, 39); + this.button1.TabIndex = 2; + this.button1.Text = "확인"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1, + this.toolStripButton2, + this.toolStripButton3}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(289, 25); + this.toolStrip1.TabIndex = 1; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.accept; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(75, 22); + this.toolStripButton1.Text = "전체선택"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStripButton2 + // + this.toolStripButton2.Image = global::FPJ0000.Properties.Resources.accept; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(75, 22); + this.toolStripButton2.Text = "선택해제"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // toolStripButton3 + // + this.toolStripButton3.Image = global::FPJ0000.Properties.Resources.accept; + this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.Size = new System.Drawing.Size(75, 22); + this.toolStripButton3.Text = "선택반전"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + // + // fSelectProcess + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(289, 392); + this.Controls.Add(this.cmbProcess); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.button1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fSelectProcess"; + this.Text = "공정 선택"; + this.Load += new System.EventHandler(this.fSelectProcess_Load); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.CheckedListBox cmbProcess; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripButton toolStripButton3; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fSelectProcess.cs b/SubProject/FPJ0000/JobReport/fSelectProcess.cs new file mode 100644 index 0000000..7cb2fe0 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fSelectProcess.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FPJ0000.JobReport +{ + public partial class fSelectProcess : Form + { + public List values = new List(); + public fSelectProcess(string[] list) + { + InitializeComponent(); + values.AddRange(list); + } + + private void fSelectProcess_Load(object sender, EventArgs e) + { + + //공정목록 + var taProc = new dsReportTableAdapters.ProcessListTableAdapter(); + var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode); + cmbProcess.Items.Clear(); + //cmbProcess.Items.Add("--전체--"); + + foreach (dsReport.ProcessListRow dr in dtProcList) + { + cmbProcess.Items.Add(dr.processs); + if (values.Contains(dr.processs)) + { + this.cmbProcess.SetItemChecked(cmbProcess.Items.Count - 1, true); + } + } + //cmbProcess.Text = FCOMMON.info.Login.process; + //if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함 + } + + private void button1_Click(object sender, EventArgs e) + { + values.Clear(); + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + if (cmbProcess.GetItemChecked(i)) + { + values.Add(cmbProcess.Items[i].ToString()); + } + } + if(values.Count < 1) + { + FCOMMON.Util.MsgE("공정선택이 필요 합니다"); + return; + } + DialogResult = DialogResult.OK; + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + cmbProcess.SetItemChecked(i, true); + } + } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + cmbProcess.SetItemChecked(i, false); + } + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++) + { + var cur = cmbProcess.GetItemChecked(i); + cmbProcess.SetItemChecked(i, !cur); + } + } + } +} diff --git a/SubProject/FPJ0000/JobReport/fSelectProcess.resx b/SubProject/FPJ0000/JobReport/fSelectProcess.resx new file mode 100644 index 0000000..c2f6c74 --- /dev/null +++ b/SubProject/FPJ0000/JobReport/fSelectProcess.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/rJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/rJobReport.Designer.cs index a9b8e42..f9c646a 100644 --- a/SubProject/FPJ0000/JobReport/rJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport/rJobReport.Designer.cs @@ -34,6 +34,8 @@ this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.panel1 = new System.Windows.Forms.Panel(); + this.tbProcess = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.btRefresh = new System.Windows.Forms.Button(); this.tbMon = new System.Windows.Forms.TextBox(); @@ -72,6 +74,8 @@ // // panel1 // + this.panel1.Controls.Add(this.tbProcess); + this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.btRefresh); this.panel1.Controls.Add(this.tbMon); @@ -82,6 +86,24 @@ this.panel1.Size = new System.Drawing.Size(721, 42); this.panel1.TabIndex = 3; // + // tbProcess + // + this.tbProcess.FormattingEnabled = true; + this.tbProcess.Location = new System.Drawing.Point(222, 10); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(158, 20); + this.tbProcess.TabIndex = 7; + this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(187, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 6; + this.label1.Text = "공정"; + // // linkLabel1 // this.linkLabel1.AutoSize = true; @@ -140,5 +162,7 @@ private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.Button btRefresh; private System.Windows.Forms.TextBox tbMon; + private System.Windows.Forms.ComboBox tbProcess; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/rJobReport.cs b/SubProject/FPJ0000/JobReport/rJobReport.cs index 75b5fb6..8615a58 100644 --- a/SubProject/FPJ0000/JobReport/rJobReport.cs +++ b/SubProject/FPJ0000/JobReport/rJobReport.cs @@ -19,12 +19,23 @@ namespace FPJ0000.JobReport private void rJobReport_Load(object sender, EventArgs e) { - RefreshData(); + this.tbProcess.Items.Clear(); + tbProcess.Items.Add("전체"); + var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); + var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); + foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) + tbProcess.Items.Add(dr.processs); + + this.tbProcess.Text = FCOMMON.info.Login.process; + if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; + + refrehData(); } - void RefreshData() + void refrehData() { - this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode); + string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); + this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname); //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; @@ -104,7 +115,12 @@ namespace FPJ0000.JobReport private void btRefresh_Click(object sender, EventArgs e) { - RefreshData(); + refrehData(); + } + + private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) + { + if (tbProcess.SelectedIndex >= 0) refrehData(); } } } diff --git a/SubProject/FPJ0000/JobReport/rJobReport.resx b/SubProject/FPJ0000/JobReport/rJobReport.resx index 81d7b0d..1693e4e 100644 --- a/SubProject/FPJ0000/JobReport/rJobReport.resx +++ b/SubProject/FPJ0000/JobReport/rJobReport.resx @@ -118,15 +118,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 119, 17 + 181, 17 - 17, 17 - - - 17, 17 + 79, 17 - 183, 17 + 17, 17 \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/rJobReportDay.cs b/SubProject/FPJ0000/JobReport/rJobReportDay.cs index 3756b80..5401ce6 100644 --- a/SubProject/FPJ0000/JobReport/rJobReportDay.cs +++ b/SubProject/FPJ0000/JobReport/rJobReportDay.cs @@ -47,7 +47,8 @@ namespace FPJ0000.JobReport } void refrehData() { - this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode); + string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); + this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode, prcname); //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout); //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; //this.reportViewer1.RefreshReport(); diff --git a/SubProject/FPJ0000/JobReport/rJobReportUser.cs b/SubProject/FPJ0000/JobReport/rJobReportUser.cs index 74418ec..024823f 100644 --- a/SubProject/FPJ0000/JobReport/rJobReportUser.cs +++ b/SubProject/FPJ0000/JobReport/rJobReportUser.cs @@ -111,6 +111,8 @@ namespace FPJ0000.JobReport if (drDays == null || drDays.Count() < 1) this.fpSpread1.Sheets[0].Cells[3, 7].Value = 0; else this.fpSpread1.Sheets[0].Cells[3, 7].Value = drDays.Count(); + //기준시간 1번시트에 추가 표시 (210215 - 정봉석) + this.fpSpread1.Sheets[1].Cells["F1"].Value = drDays.Count() * 8; ComplexBorderSide left = new ComplexBorderSide(Color.Gray, 1); ComplexBorderSide top = new ComplexBorderSide(Color.Gray, 1); @@ -194,7 +196,7 @@ namespace FPJ0000.JobReport this.fpSpread1.Sheets[1].Cells[row, 3].Value = item.Sum(t => t.ot); row += 1; } - fpSpread1.Sheets[1].ColumnCount = 5; + fpSpread1.Sheets[1].ColumnCount = 6; fpSpread1.Sheets[1].RowCount = row + 1; //Raw dat a표시 diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index de7bf06..f763bf5 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY - zVTMvM0pmprowiBbzEXmJTRxQoUoXV5UaJZOberc5nTDGZnL1LzfwMtSdzln7mx+e87ZUgOhH3x4Xjzn - ++H8vufw2Am5r068VKpXRpbpf4dK9BQ5aY5y9jTQkaV9dPgTnemsWFvpF/VuHxfaPWGPerTLFnrVZDK5 - zDYHzNYdVi0sNH4uWlD4aRaxZSN2QZZivzfqmYhi3TIb7pt2wjDDwDDLQD/NQDe1CfUvB9qGbXAwQPMI - hcKPM0h5ZqL+kYRK2qgN+yYG5lz4OseQk0E/J9mEZtyBL8N2InBjYNEFw4ITMsUs+Pe63nLhmPKgyRuS - qC2R/BpSqq+jur0eRQ3l4Ev8EUQQyM4gRHoSFc0V3CpWmsHSmh0hCRqGE0SX8j90DbWgZewlqvX5nCSh - Khz5r+ORXR8LYc1lJNcko3lwCS0mKz5/38A66SlU2kNzAkGlYL+fJMelH+3GqyEpStRZnCRRHkHCV5D+ - PA3acRu3SucYBSXpYc3mRGhRr0fATlixhs6tTYJxXIcaw1087shDTPkFJFZFwThth5EUyxasnfB0YiaC - EOkuwbkHEuepgsOIrxRgYKIPsu4MSBW5iH0ajHp1E77NMzCSYvumnOglLFuc4D/0Co6LfUSB4kPIrovD - TXkY4ioucpJcRTzEDWnkTYLB3g/MutDPfmKChRQZkKPzCALFB+YDxQfJQz4IzPfB1ZJgZL5IgnZYCZmy - ABnvkyCUR8NIBAbyb+iJgHa6iUC9s8L5nB56cZ3G4LyLQzO6gDu16UglQVFNLPLqbm/fsdg3XUTQuCNg - bXPmHcH/sLErpO0SnM5V2d80Kbf2engvVGqt+2hCs9UbJ0Wmd0zObNgtKpXKPblCYXKZwriXFauTg23e - SpOwSuOmKGrd91brD2+cxzuR3p4ZIGzrOCZSmgNEjfQ2qR78/yJspH2FrWtHkls7/ZMUKTwej/cHMGye - UcYINAcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY + zVTMvM0pmprowiBbTCPzEpqoUCFK0osKtdJ5mTq3ObfhjMxlat5v4GWpu5wzdza/PedsqYHQDz48L57z + /XB+33N47AQ/UiZcLdXJI8p0v0MkOoqcNEc5e+rpiFItHfZcY7wgVlf6Rr4/xIX2T+jTfvWqmV43Go1O + k9UOk2WPdTMLjZ/LZhR8nkdM2ZhNkCnz8kTdE16sWWXD2lkH9HMM9PMMdLMMNDPbUP6yo2PUCjsDtI5R + KGiZQ/JLI/WPJETSQW3ZtjG04MTXBYacDAY5yTZUk3Z0jdqIwIWhZSf0Sw4UyeYR+LD3HReOLg+Yvi2J + 3BHV3ERy9S1UdzagsKkcgRI/BBAERecRLD2DitYKbhULzWBlw4bgeBXDCaJKAz/2jrShbeINqnV5nCS+ + Kgx5jXHIaoiBsPYakmqT0Dq8gjajBV++b2GT9BQi7ac5gaBS4OUryXbqxvvwdkSKEmUmJ0moCSfh60h7 + lQr1pJVbpWeCgpz0sGF1IKRwwC1gJ7RYRefUJcIwqUGt/gGedeciuvwyEqoiYZi1wUCKZQtWT7k7MRFB + sHSf4OJjieNs/jHEVQowNKVFUV86pLIcxLwIQoPyE74tMjCQYrUzDgwQVs0OBD7xCE6JvUV88VFk1cfi + Tk0oYiuucJIcWRzETankTYLA3g/NOzHIfmKCmRTpn61xC/jiw4t88RHykDf4ed64URKEjNeJUI/KUSTP + R/qHRAhromAgAj35N3REQDtcRKDcW+FSdj+9vEljeNHJoRpfwv26NKSQoKg2Brn193bvWGzbTiJo3hOw + tgXTnuB/WNkVUvcJzuUobI0tXTsHPXwQij6V60R8q8UTJ0WmdU/PbdnMCoXCNb1GYXqVwqSHNYuDg23e + QpOwQumiKGrT5277D0+cxzud1pnhL+zoPimSm/xFzfQuKW78/iJspn2E7RvHk9p7/BJlyTwej/cHLNme + S8tQCB0AAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 28a3ee6..60829b9 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -155,6 +155,7 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabControl2 = new System.Windows.Forms.TabControl(); + this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.arPanel4 = new arCtl.arPanel(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); @@ -175,7 +176,6 @@ this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton7 = new System.Windows.Forms.ToolStripButton(); - this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.arLabel12 = new arCtl.arLabel(); this.tabPage5 = new System.Windows.Forms.TabPage(); @@ -251,13 +251,13 @@ this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabControl2.SuspendLayout(); + this.tabPage3.SuspendLayout(); this.tabPage4.SuspendLayout(); this.arPanel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).BeginInit(); this.bindingNavigator2.SuspendLayout(); - this.tabPage3.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage5.SuspendLayout(); this.arPanel5.SuspendLayout(); @@ -583,7 +583,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(453, 280); + this.remark_reqTextBox.Size = new System.Drawing.Size(485, 280); this.remark_reqTextBox.TabIndex = 49; // // ddateTextBox @@ -633,7 +633,7 @@ this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1026, 25); + this.bn.Size = new System.Drawing.Size(1058, 25); this.bn.TabIndex = 65; this.bn.Text = "bindingNavigator1"; // @@ -671,7 +671,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -783,7 +782,7 @@ this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(440, 270); + this.dataGridView1.Size = new System.Drawing.Size(472, 270); this.dataGridView1.TabIndex = 0; this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); // @@ -1266,7 +1265,7 @@ this.panel3.Controls.Add(costoLabel); this.panel3.Location = new System.Drawing.Point(6, 561); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(546, 93); + this.panel3.Size = new System.Drawing.Size(546, 86); this.panel3.TabIndex = 86; // // arLabel5 @@ -1350,7 +1349,7 @@ this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.arLabel6.SignColor = System.Drawing.Color.Yellow; this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.arLabel6.Size = new System.Drawing.Size(453, 23); + this.arLabel6.Size = new System.Drawing.Size(485, 23); this.arLabel6.TabIndex = 86; this.arLabel6.Text = "개선 방향"; this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1383,7 +1382,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(455, 305); + this.arPanel1.Size = new System.Drawing.Size(487, 305); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1414,7 +1413,7 @@ this.arPanel2.ProgressValue = 0F; this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel2.ShowBorder = true; - this.arPanel2.Size = new System.Drawing.Size(442, 297); + this.arPanel2.Size = new System.Drawing.Size(474, 297); this.arPanel2.TabIndex = 89; this.arPanel2.Text = "arPanel2"; this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1448,7 +1447,7 @@ this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1; this.bindingNavigator1.Name = "bindingNavigator1"; this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1; - this.bindingNavigator1.Size = new System.Drawing.Size(440, 25); + this.bindingNavigator1.Size = new System.Drawing.Size(472, 25); this.bindingNavigator1.TabIndex = 87; this.bindingNavigator1.Text = "bindingNavigator1"; // @@ -1486,7 +1485,6 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; - this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -1554,6 +1552,8 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_JobReport_AutoInputTableAdapter = null; + this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; @@ -1897,7 +1897,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1026, 679); + this.tabControl1.Size = new System.Drawing.Size(1058, 679); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -1912,28 +1912,41 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1018, 653); + this.tabPage1.Size = new System.Drawing.Size(1050, 653); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; // // tabControl2 // + this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); this.tabControl2.Location = new System.Drawing.Point(559, 318); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; - this.tabControl2.Size = new System.Drawing.Size(456, 329); + this.tabControl2.Size = new System.Drawing.Size(488, 329); this.tabControl2.TabIndex = 90; // + // tabPage3 + // + this.tabPage3.Controls.Add(this.arPanel2); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(480, 303); + this.tabPage3.TabIndex = 0; + this.tabPage3.Text = "업무 현황"; + this.tabPage3.UseVisualStyleBackColor = true; + // // tabPage4 // this.tabPage4.Controls.Add(this.arPanel4); this.tabPage4.Location = new System.Drawing.Point(4, 22); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(448, 303); + this.tabPage4.Size = new System.Drawing.Size(480, 303); this.tabPage4.TabIndex = 1; this.tabPage4.Text = "메모"; this.tabPage4.UseVisualStyleBackColor = true; @@ -1962,7 +1975,7 @@ this.arPanel4.ProgressValue = 0F; this.arPanel4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel4.ShowBorder = true; - this.arPanel4.Size = new System.Drawing.Size(442, 297); + this.arPanel4.Size = new System.Drawing.Size(474, 297); this.arPanel4.TabIndex = 90; this.arPanel4.Text = "arPanel4"; this.arPanel4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1991,7 +2004,7 @@ this.dataGridView2.RowHeadersVisible = false; this.dataGridView2.RowTemplate.Height = 23; this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView2.Size = new System.Drawing.Size(440, 270); + this.dataGridView2.Size = new System.Drawing.Size(472, 270); this.dataGridView2.TabIndex = 0; // // dataGridViewTextBoxColumn3 @@ -2053,7 +2066,7 @@ this.bindingNavigator2.MovePreviousItem = this.toolStripButton2; this.bindingNavigator2.Name = "bindingNavigator2"; this.bindingNavigator2.PositionItem = this.toolStripTextBox1; - this.bindingNavigator2.Size = new System.Drawing.Size(440, 25); + this.bindingNavigator2.Size = new System.Drawing.Size(472, 25); this.bindingNavigator2.TabIndex = 87; this.bindingNavigator2.Text = "bindingNavigator2"; // @@ -2091,7 +2104,6 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; - this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -2152,17 +2164,6 @@ this.toolStripButton7.Text = "삭제"; this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); // - // tabPage3 - // - this.tabPage3.Controls.Add(this.arPanel2); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(448, 303); - this.tabPage3.TabIndex = 0; - this.tabPage3.Text = "업무 현황"; - this.tabPage3.UseVisualStyleBackColor = true; - // // tabPage2 // this.tabPage2.Controls.Add(this.tableLayoutPanel1); @@ -2441,7 +2442,6 @@ // this.toolStripTextBox2.AccessibleName = "위치"; this.toolStripTextBox2.AutoSize = false; - this.toolStripTextBox2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox2.Name = "toolStripTextBox2"; this.toolStripTextBox2.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox2.Text = "0"; @@ -2524,7 +2524,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1026, 704); + this.ClientSize = new System.Drawing.Size(1058, 704); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.MinimizeBox = false; @@ -2564,6 +2564,7 @@ this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabControl2.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); this.tabPage4.ResumeLayout(false); this.arPanel4.ResumeLayout(false); this.arPanel4.PerformLayout(); @@ -2572,7 +2573,6 @@ ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).EndInit(); this.bindingNavigator2.ResumeLayout(false); this.bindingNavigator2.PerformLayout(); - this.tabPage3.ResumeLayout(false); this.tabPage2.ResumeLayout(false); this.tabPage5.ResumeLayout(false); this.arPanel5.ResumeLayout(false); diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs index d1ba71e..c890be5 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs @@ -60,6 +60,7 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.itemModelTextBox = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.panel3 = new System.Windows.Forms.Panel(); this.checkBox1 = new System.Windows.Forms.CheckBox(); @@ -78,7 +79,6 @@ this.itemNameTextBox = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.itemModelTextBox = new System.Windows.Forms.TextBox(); pdateLabel = new System.Windows.Forms.Label(); statusLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label(); @@ -257,6 +257,15 @@ label1.TabIndex = 6; label1.Text = "납기일"; // + // itemModelLabel + // + itemModelLabel.AutoSize = true; + itemModelLabel.Location = new System.Drawing.Point(44, 66); + itemModelLabel.Name = "itemModelLabel"; + itemModelLabel.Size = new System.Drawing.Size(48, 12); + itemModelLabel.TabIndex = 24; + itemModelLabel.Text = "MODEL"; + // // bs // this.bs.DataMember = "ProjectPartStatus"; @@ -416,6 +425,14 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "파트정보"; // + // itemModelTextBox + // + this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true)); + this.itemModelTextBox.Location = new System.Drawing.Point(98, 62); + this.itemModelTextBox.Name = "itemModelTextBox"; + this.itemModelTextBox.Size = new System.Drawing.Size(602, 21); + this.itemModelTextBox.TabIndex = 25; + // // textBox1 // this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Item", true)); @@ -571,7 +588,7 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(713, 39); this.button1.TabIndex = 17; - this.button1.Text = "저장"; + this.button1.Text = "확인"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // @@ -583,23 +600,6 @@ this.panel2.Size = new System.Drawing.Size(713, 5); this.panel2.TabIndex = 18; // - // itemModelLabel - // - itemModelLabel.AutoSize = true; - itemModelLabel.Location = new System.Drawing.Point(44, 66); - itemModelLabel.Name = "itemModelLabel"; - itemModelLabel.Size = new System.Drawing.Size(48, 12); - itemModelLabel.TabIndex = 24; - itemModelLabel.Text = "MODEL"; - // - // itemModelTextBox - // - this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true)); - this.itemModelTextBox.Location = new System.Drawing.Point(98, 62); - this.itemModelTextBox.Name = "itemModelTextBox"; - this.itemModelTextBox.Size = new System.Drawing.Size(602, 21); - this.itemModelTextBox.TabIndex = 25; - // // fProjectPartListEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx index c8a1ee0..18c6462 100644 --- a/SubProject/FPJ0000/Project/fProjectPartListEdit.resx +++ b/SubProject/FPJ0000/Project/fProjectPartListEdit.resx @@ -168,22 +168,19 @@ False + + False + 100, 17 17, 17 - - 17, 17 - 164, 17 226, 17 - - False - \ No newline at end of file diff --git a/SubProject/FPJ0000/ReportForUser.xlsx b/SubProject/FPJ0000/ReportForUser.xlsx index 44d845f5e7f2a6af4555d3afe2202e2b3e59b07c..27775f569ed6b57fef005d1b6c664b17625aa1e1 100644 GIT binary patch delta 11541 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 @@ -2177,6 +2235,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string UserProcess { + get { + if (this.IsUserProcessNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableJobReportDay.UserProcessColumn])); + } + } + set { + this[this.tableJobReportDay.UserProcessColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsunameNull() { @@ -2224,6 +2298,18 @@ namespace FPJ0000 { public void SetprocesssNull() { this[this.tableJobReportDay.processsColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsUserProcessNull() { + return this.IsNull(this.tableJobReportDay.UserProcessColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetUserProcessNull() { + this[this.tableJobReportDay.UserProcessColumn] = global::System.Convert.DBNull; + } } /// @@ -2807,6 +2893,7 @@ namespace FPJ0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("uname", "uname"); tableMapping.ColumnMappings.Add("hrs", "hrs"); tableMapping.ColumnMappings.Add("ot", "ot"); + tableMapping.ColumnMappings.Add("UserProcess", "UserProcess"); this._adapter.TableMappings.Add(tableMapping); } @@ -2823,18 +2910,20 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot\r\nFROM vUserWorkTimeList\r\nWHERE (SUB" + - "STRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)\r\nORDER BY yymm"; + this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess\r\nFROM vUserWorkTimeList" + + "\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserPr" + + "ocess, \'\') LIKE @userprocess)\r\nORDER BY yymm"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode) { + public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yyyy == null)) { throw new global::System.ArgumentNullException("yyyy"); @@ -2848,6 +2937,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -2859,7 +2954,7 @@ namespace FPJ0000.dsReportTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode) { + public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode, string userprocess) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yyyy == null)) { throw new global::System.ArgumentNullException("yyyy"); @@ -2873,6 +2968,12 @@ namespace FPJ0000.dsReportTableAdapters { else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); + } dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -3006,6 +3107,7 @@ namespace FPJ0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("hrs", "hrs"); tableMapping.ColumnMappings.Add("ot", "ot"); tableMapping.ColumnMappings.Add("processs", "processs"); + tableMapping.ColumnMappings.Add("UserProcess", "UserProcess"); this._adapter.TableMappings.Add(tableMapping); } @@ -3022,22 +3124,25 @@ namespace FPJ0000.dsReportTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot -FROM JobReport LEFT OUTER JOIN + this._commandCollection[0].CommandText = @"SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, + EETGW_GroupUser.Process AS UserProcess +FROM JobReport INNER JOIN + EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON JobReport.uid = Users.id -WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) -GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs +WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess) +GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process ORDER BY processs, JobReport.pdate, uname"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yymm", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode) { + public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode, string userprocess) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yymm == null)) { throw new global::System.ArgumentNullException("yymm"); @@ -3051,6 +3156,12 @@ ORDER BY processs, JobReport.pdate, uname"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -3062,7 +3173,7 @@ ORDER BY processs, JobReport.pdate, uname"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode) { + public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode, string userprocess) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((yymm == null)) { throw new global::System.ArgumentNullException("yymm"); @@ -3076,6 +3187,12 @@ ORDER BY processs, JobReport.pdate, uname"; else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } + if ((userprocess == null)) { + throw new global::System.ArgumentNullException("userprocess"); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); + } dsReport.JobReportDayDataTable dataTable = new dsReport.JobReportDayDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index e77d176..aea1ee6 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -9,16 +9,17 @@ - + - SELECT yymm, total, uid, uname, hrs, ot + SELECT yymm, total, uid, uname, hrs, ot, UserProcess FROM vUserWorkTimeList -WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) +WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) ORDER BY yymm - + + @@ -31,6 +32,7 @@ ORDER BY yymm + @@ -39,15 +41,18 @@ ORDER BY yymm - SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot -FROM JobReport LEFT OUTER JOIN + SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, + EETGW_GroupUser.Process AS UserProcess +FROM JobReport INNER JOIN + EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON JobReport.uid = Users.id -WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) -GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs +WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess) +GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process ORDER BY processs, JobReport.pdate, uname + @@ -60,6 +65,7 @@ ORDER BY processs, JobReport.pdate, uname + @@ -177,13 +183,20 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O + + + + + + + - + @@ -197,7 +210,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O - + @@ -213,6 +226,13 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O + + + + + + + @@ -263,7 +283,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O - + diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index f920d55..b052405 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -4,10 +4,10 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - +