ot 시간 범위 입렭 가능 하게
This commit is contained in:
		| @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; | |||||||
| // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 | // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 | ||||||
| // 지정되도록 할 수 있습니다. | // 지정되도록 할 수 있습니다. | ||||||
| // [assembly: AssemblyVersion("1.0.*")] | // [assembly: AssemblyVersion("1.0.*")] | ||||||
| [assembly: AssemblyVersion("21.07.20.2100")] | [assembly: AssemblyVersion("21.07.23.1500")] | ||||||
| [assembly: AssemblyFileVersion("21.07.20.2100")] | [assembly: AssemblyFileVersion("21.07.23.1500")] | ||||||
|   | |||||||
| @@ -37,6 +37,11 @@ namespace FCM0000 | |||||||
|             this.Show(); |             this.Show(); | ||||||
|             Application.DoEvents(); |             Application.DoEvents(); | ||||||
|  |  | ||||||
|  |             if (this.WindowState == FormWindowState.Minimized) this.WindowState = FormWindowState.Normal; | ||||||
|  |             if (this.RestoreBounds.X + this.RestoreBounds.Width < 300 && this.RestoreBounds.X < 0) | ||||||
|  |                 this.Location = new Point(0, 0); | ||||||
|  |  | ||||||
|  |  | ||||||
|             toolStripButton1.Visible = FCOMMON.info.Login.no == "dev"; |             toolStripButton1.Visible = FCOMMON.info.Login.no == "dev"; | ||||||
|             // this.TopMost=true; |             // this.TopMost=true; | ||||||
|             // this.Activate(); |             // this.Activate(); | ||||||
|   | |||||||
							
								
								
									
										285
									
								
								SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										285
									
								
								SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -44,6 +44,8 @@ | |||||||
|             FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = 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.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); | ||||||
|             FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); |             FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); | ||||||
|  |             FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); | ||||||
|  |             FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); | ||||||
|             FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); |             FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); | ||||||
|             this.bn = new System.Windows.Forms.BindingNavigator(this.components); |             this.bn = new System.Windows.Forms.BindingNavigator(this.components); | ||||||
|             this.bs = new System.Windows.Forms.BindingSource(this.components); |             this.bs = new System.Windows.Forms.BindingSource(this.components); | ||||||
| @@ -72,6 +74,7 @@ | |||||||
|             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); |             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); | ||||||
|             this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); |             this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); | ||||||
|             this.btImport = new System.Windows.Forms.ToolStripButton(); |             this.btImport = new System.Windows.Forms.ToolStripButton(); | ||||||
|  |             this.btOpenFolder = new System.Windows.Forms.ToolStripButton(); | ||||||
|             this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); |             this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); | ||||||
|             this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); |             this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
|             this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); |             this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
| @@ -90,7 +93,6 @@ | |||||||
|             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); |             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); | ||||||
|             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); |             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); | ||||||
|             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); |             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); | ||||||
|             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); |  | ||||||
|             this.toolStrip1 = new System.Windows.Forms.ToolStrip(); |             this.toolStrip1 = new System.Windows.Forms.ToolStrip(); | ||||||
|             this.lbStt = new System.Windows.Forms.ToolStripLabel(); |             this.lbStt = new System.Windows.Forms.ToolStripLabel(); | ||||||
|             this.dtSD = new System.Windows.Forms.ToolStripTextBox(); |             this.dtSD = new System.Windows.Forms.ToolStripTextBox(); | ||||||
| @@ -108,15 +110,15 @@ | |||||||
|             this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); |             this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); | ||||||
|             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); |             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); | ||||||
|             this.richTextBox1 = new System.Windows.Forms.RichTextBox(); |             this.richTextBox1 = new System.Windows.Forms.RichTextBox(); | ||||||
|             this.btOpenFolder = new System.Windows.Forms.ToolStripButton(); |             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); | ||||||
|             this.bn.SuspendLayout(); |             this.bn.SuspendLayout(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); | ||||||
|             this.cm.SuspendLayout(); |             this.cm.SuspendLayout(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); |  | ||||||
|             this.toolStrip1.SuspendLayout(); |             this.toolStrip1.SuspendLayout(); | ||||||
|  |             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); | ||||||
|             this.SuspendLayout(); |             this.SuspendLayout(); | ||||||
|             //  |             //  | ||||||
|             // bn |             // bn | ||||||
| @@ -376,6 +378,15 @@ | |||||||
|             this.btImport.Text = "가져오기"; |             this.btImport.Text = "가져오기"; | ||||||
|             this.btImport.Click += new System.EventHandler(this.btImport_Click); |             this.btImport.Click += new System.EventHandler(this.btImport_Click); | ||||||
|             //  |             //  | ||||||
|  |             // btOpenFolder | ||||||
|  |             //  | ||||||
|  |             this.btOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("btOpenFolder.Image"))); | ||||||
|  |             this.btOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta; | ||||||
|  |             this.btOpenFolder.Name = "btOpenFolder"; | ||||||
|  |             this.btOpenFolder.Size = new System.Drawing.Size(75, 22); | ||||||
|  |             this.btOpenFolder.Text = "폴더열기"; | ||||||
|  |             this.btOpenFolder.Click += new System.EventHandler(this.btOpenFolder_Click); | ||||||
|  |             //  | ||||||
|             // cm |             // cm | ||||||
|             //  |             //  | ||||||
|             this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); |             this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); | ||||||
| @@ -533,122 +544,6 @@ | |||||||
|             this.fpSpread1.StatusBarVisible = true; |             this.fpSpread1.StatusBarVisible = true; | ||||||
|             this.fpSpread1.TabIndex = 2; |             this.fpSpread1.TabIndex = 2; | ||||||
|             //  |             //  | ||||||
|             // fpSpread1_Sheet1 |  | ||||||
|             //  |  | ||||||
|             this.fpSpread1_Sheet1.Reset(); |  | ||||||
|             this.fpSpread1_Sheet1.SheetName = "Sheet1"; |  | ||||||
|             // Formulas and custom names must be loaded with R1C1 reference style |  | ||||||
|             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnCount = 15; |  | ||||||
|             this.fpSpread1_Sheet1.ActiveColumnIndex = -1; |  | ||||||
|             this.fpSpread1_Sheet1.ActiveRowIndex = -1; |  | ||||||
|             this.fpSpread1_Sheet1.AutoGenerateColumns = false; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "#"; |  | ||||||
|             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |  | ||||||
|             numberCellType1.DecimalPlaces = 0; |  | ||||||
|             numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; |  | ||||||
|             numberCellType1.MaximumValue = 2147483647D; |  | ||||||
|             numberCellType1.MinimumValue = -2147483648D; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; |  | ||||||
|             numberCellType2.MaximumValue = 999999999999999D; |  | ||||||
|             numberCellType2.MinimumValue = -999999999999999D; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; |  | ||||||
|             numberCellType3.MaximumValue = 999999999999999D; |  | ||||||
|             numberCellType3.MinimumValue = -999999999999999D; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "tag"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(14).Label = "#"; |  | ||||||
|             this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; |  | ||||||
|             this.fpSpread1_Sheet1.DataAutoSizeColumns = false; |  | ||||||
|             this.fpSpread1_Sheet1.DataSource = this.bs; |  | ||||||
|             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; |  | ||||||
|             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; |  | ||||||
|             //  |  | ||||||
|             // toolStrip1 |             // toolStrip1 | ||||||
|             //  |             //  | ||||||
|             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); |             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); | ||||||
| @@ -805,14 +700,148 @@ | |||||||
|             this.richTextBox1.TabIndex = 5; |             this.richTextBox1.TabIndex = 5; | ||||||
|             this.richTextBox1.Text = ""; |             this.richTextBox1.Text = ""; | ||||||
|             //  |             //  | ||||||
|             // btOpenFolder |             // fpSpread1_Sheet1 | ||||||
|             //  |             //  | ||||||
|             this.btOpenFolder.Image = ((System.Drawing.Image)(resources.GetObject("btOpenFolder.Image"))); |             this.fpSpread1_Sheet1.Reset(); | ||||||
|             this.btOpenFolder.ImageTransparentColor = System.Drawing.Color.Magenta; |             this.fpSpread1_Sheet1.SheetName = "Sheet1"; | ||||||
|             this.btOpenFolder.Name = "btOpenFolder"; |             // Formulas and custom names must be loaded with R1C1 reference style | ||||||
|             this.btOpenFolder.Size = new System.Drawing.Size(75, 22); |             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; | ||||||
|             this.btOpenFolder.Text = "폴더열기"; |             this.fpSpread1_Sheet1.ColumnCount = 17; | ||||||
|             this.btOpenFolder.Click += new System.EventHandler(this.btOpenFolder_Click); |             this.fpSpread1_Sheet1.ActiveColumnIndex = -1; | ||||||
|  |             this.fpSpread1_Sheet1.ActiveRowIndex = -1; | ||||||
|  |             this.fpSpread1_Sheet1.AutoGenerateColumns = false; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "#"; | ||||||
|  |             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||||
|  |             numberCellType1.DecimalPlaces = 0; | ||||||
|  |             numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; | ||||||
|  |             numberCellType1.MaximumValue = 2147483647D; | ||||||
|  |             numberCellType1.MinimumValue = -2147483648D; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).Label = "*"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F; | ||||||
|  |             numberCellType2.MaximumValue = 999999999999999D; | ||||||
|  |             numberCellType2.MinimumValue = -999999999999999D; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F; | ||||||
|  |             numberCellType3.MaximumValue = 999999999999999D; | ||||||
|  |             numberCellType3.MinimumValue = -999999999999999D; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||||
|  |             dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); | ||||||
|  |             dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; | ||||||
|  |             dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; | ||||||
|  |             dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); | ||||||
|  |             dateTimeCellType1.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0); | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||||
|  |             dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); | ||||||
|  |             dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; | ||||||
|  |             dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly; | ||||||
|  |             dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); | ||||||
|  |             dateTimeCellType2.TimeDefault = new System.DateTime(2021, 7, 23, 22, 53, 4, 0); | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).Label = "초과종료"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "tag"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(16).Label = "#"; | ||||||
|  |             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; | ||||||
|  |             this.fpSpread1_Sheet1.DataAutoCellTypes = false; | ||||||
|  |             this.fpSpread1_Sheet1.DataAutoSizeColumns = false; | ||||||
|  |             this.fpSpread1_Sheet1.DataSource = this.bs; | ||||||
|  |             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; | ||||||
|  |             this.fpSpread1_Sheet1.ShowRowSelector = true; | ||||||
|  |             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; | ||||||
|             //  |             //  | ||||||
|             // fJobReport |             // fJobReport | ||||||
|             //  |             //  | ||||||
| @@ -834,9 +863,9 @@ | |||||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); |             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); | ||||||
|             this.cm.ResumeLayout(false); |             this.cm.ResumeLayout(false); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); |             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); |  | ||||||
|             this.toolStrip1.ResumeLayout(false); |             this.toolStrip1.ResumeLayout(false); | ||||||
|             this.toolStrip1.PerformLayout(); |             this.toolStrip1.PerformLayout(); | ||||||
|  |             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); | ||||||
|             this.ResumeLayout(false); |             this.ResumeLayout(false); | ||||||
|             this.PerformLayout(); |             this.PerformLayout(); | ||||||
|  |  | ||||||
| @@ -906,7 +935,7 @@ | |||||||
|         private System.Windows.Forms.ToolStripButton toolStripButton4; |         private System.Windows.Forms.ToolStripButton toolStripButton4; | ||||||
|         private System.Windows.Forms.ToolStripButton btImport; |         private System.Windows.Forms.ToolStripButton btImport; | ||||||
|         private System.Windows.Forms.ToolStripButton toolStripButton5; |         private System.Windows.Forms.ToolStripButton toolStripButton5; | ||||||
|         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; |  | ||||||
|         private System.Windows.Forms.ToolStripButton btOpenFolder; |         private System.Windows.Forms.ToolStripButton btOpenFolder; | ||||||
|  |         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -520,6 +520,8 @@ namespace FPJ0000 | |||||||
|             newdr.idx = -1; |             newdr.idx = -1; | ||||||
|             newdr.hrs = 8.0; |             newdr.hrs = 8.0; | ||||||
|             newdr.ot = 0.0; |             newdr.ot = 0.0; | ||||||
|  |             newdr.SetotEndNull(); | ||||||
|  |             newdr.SetotStartNull(); | ||||||
|             newdr.EndEdit(); |             newdr.EndEdit(); | ||||||
|  |  | ||||||
|             //var newdr = this.dsMSSQL.JobReport.NewJobReportRow(); |             //var newdr = this.dsMSSQL.JobReport.NewJobReportRow(); | ||||||
|   | |||||||
| @@ -260,20 +260,20 @@ | |||||||
|   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> |   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||||||
|     <value> |     <value> | ||||||
|         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 |         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 | ||||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NhHMf3Kv+EsF70UohScmFRL0pTmxrY |         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPhZLdS1NhHMd3lX9CWBddClFaKRV1US61WYG9 | ||||||
|         zVTUvM0pmprowiBTppF5CU1UqBCl6EWFqOnUpuac0w1nZNpS8zov4GVOdzlHd8789pyz4QyEfvDhefGc |         WVmZTucUTW3owiBTp5FphiYqVIhSdFFRVnNqU2vO5UYzelmm5st8jU2Xez1Hd8769pyz1QyEfvDhuXjO | ||||||
|         74fz+54j4CboiTLhRrlGEV6h2Qou1lDkpHkquVNLh5cP06Ev1BOXparq0xEfj/GhwxPybFC1bqY3VzZM |         98P5fc8RcBN7VZN6pFqvTril/xlXpqfISfPUcKeBTqgeoA/d1Jn2yrV1mxMfr+NDqyf+er/W6qQXZyw2 | ||||||
|         rNG6C6PFzaaZg8bvVTMK2gyIrZi0iTLlHq6oc8JK1etrxh12eMEO7SIDrYGBZoGBen4Pyj+76NJbscsA |         1uZehs0VZNHJQePbvBPFL6dx9tawR5SrCglE/XO4Umf9sbDEDpi9MEwxMEwz0JsZ6CZXoPm+jM4hN5YZ | ||||||
|         7ZMUCloWkfxqgvpHElzUS+3Y9jC6xOL7EkNOBiO8ZA8DM7v4qrcRgQOjqyy0K3aUyA0IeNz3gQ9HVfrP |         QDlMobhtCul3TNQ/krgSNeXwrGBwhsWHGYacDN7zkhX0jS3j9ZCHCHwYnGdhmPOiQjUN4ZXeR3z4TE30 | ||||||
|         3SuO2JfU3UFy7V3UdjehuLkSAYXe8CeISi4hSOaHqvYqfhULzWDNZEOQdIDhBZHlAZ/7xjvQMf0WtZo8 |         xKmyxF/SxhNIbziJhq5WlD+rgbAkHNEEUcUexCp2olZZy6/iohlYljyILehjeMHpauHT3i/taB+9jwZ9 | ||||||
|         XhJfE4q893HIaoqGuP4mkuqT0D62ho4JC7783ME26SlYNkjzAlG1yCNUls1qpvrxblyGMmUmL0moCyPh |         IS9JqT+EwofJyGtNgqTpKNKa0qD8ZEG7yYVXnx2wk57iFP00LxDViUJEpfmsfuQtHnxRoEqTy0tSGw+T | ||||||
|         W0h7nQrVjJVfpXeagoL0YLLaEVw85BRwE1I6QOc0JEI3o0a99hGe9+QiqvIaEmoioFuwQUeK5QpWzTo7 |         8DFk3c2EdszNr9IzSkFNelhyexFX/s4v4Ca+so+WNYthHNOhyXAZN7oLcKbmAFLrE2E0e2AkxXIFa8f9 | ||||||
|         MRJBkOyQ4MrTQvuF/FOIqxZhdHYYJf3pkMlzEP0yEE3KVvxYZqAjxQ7P2zFEWDfbEVDkEvhKPSVC6Ulk |         ndiIIFaxSrDvWol3V9EmJNeJMDg+gIq32VCoZEi6HYNWzQt8nGVgJMUOTHrxjmB1eiEsDQh2yEOlkfKN | ||||||
|         NcYgti4EMVXXeUmOPA7S5lTyJoHg7kcNLEa4T0wwkyL9ctVOgVB6fFkoPUEe8oQwzxO3ywKR8SYRKr0C |         yGs5h/ON8ThXe5CXyFTJkD/LJG8SA+5+cJrFe+4TE5ykyCiZzi+IlK+fjZRvIA+FIrIwFMerYpBzTwzt | ||||||
|         JYp8pH9KhLguEjoi0JJ/Q0MEtN0B32yle4WruYP06jaNsWWWZ2BqBQ8b0pBCgpL6aOQ2Pji447DtsfDJ |         kBoV6iJkPxFD0ngaRiIwkH9DTwS014dt+ZrgCvtl/fS8ncanWZanb2QOl5qzkEGC0qYkFLRc/HvH4Vlh | ||||||
|         lrsFQmJbMroF/8NKVvBJbXMLLuZ8s+kNm/tHPXwUJrPVcTa+3eKKkyLTeuYWd2xm/dKWY26Dwtw6hRkX |         EZGvDAq2E9uMLSj4H26yQkRmW1CwW/bGYzJbf6318FrY7E7f1hSlKxAnRWZ1T0w5PE7T1KJvYoHChJXC | ||||||
|         GxY7D9e8hWaxYbI4KIra9rrf+csVFwjOp3Vn+Ii7es5JFEYfSSt9QIoT75QWJ+IW2kvcaTqT1NnrnShP |         WIAFl5eHa95Fs7DYHD6KouxhFzq+BuICQVRWV06EpLN7u1Rti5A+p/+S4Sf8D5LndJikY2lLWkdPuFiV | ||||||
|         FggEgr9Ef6FyBTeROAAAAABJRU5ErkJggg== |         LhAIBL8ByxmhJDO9TtAAAAAASUVORK5CYII= | ||||||
| </value> | </value> | ||||||
|   </data> |   </data> | ||||||
|   <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> |   <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||||||
| @@ -354,6 +354,26 @@ | |||||||
|   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>561, 17</value> |     <value>561, 17</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|  |   <data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64"> | ||||||
|  |     <value> | ||||||
|  |         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh | ||||||
|  |         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 | ||||||
|  |         cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 | ||||||
|  |         AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// | ||||||
|  |         K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA | ||||||
|  |         AAD/////AQgAAP////8AAQgAAAs= | ||||||
|  | </value> | ||||||
|  |   </data> | ||||||
|  |   <data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64"> | ||||||
|  |     <value> | ||||||
|  |         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh | ||||||
|  |         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 | ||||||
|  |         cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 | ||||||
|  |         AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// | ||||||
|  |         K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA | ||||||
|  |         AAD/////AQgAAP////8AAQgAAAs= | ||||||
|  | </value> | ||||||
|  |   </data> | ||||||
|   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>393, 17</value> |     <value>393, 17</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|   | |||||||
| @@ -39,6 +39,7 @@ | |||||||
|             System.Windows.Forms.Label label3; |             System.Windows.Forms.Label label3; | ||||||
|             System.Windows.Forms.Label label6; |             System.Windows.Forms.Label label6; | ||||||
|             System.Windows.Forms.Label label2; |             System.Windows.Forms.Label label2; | ||||||
|  |             System.Windows.Forms.Label label7; | ||||||
|             this.lbSummary = new System.Windows.Forms.Label(); |             this.lbSummary = new System.Windows.Forms.Label(); | ||||||
|             this.tbHrs = new System.Windows.Forms.TextBox(); |             this.tbHrs = new System.Windows.Forms.TextBox(); | ||||||
|             this.bs = new System.Windows.Forms.BindingSource(this.components); |             this.bs = new System.Windows.Forms.BindingSource(this.components); | ||||||
| @@ -64,6 +65,8 @@ | |||||||
|             this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); |             this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); | ||||||
|             this.panel1 = new System.Windows.Forms.Panel(); |             this.panel1 = new System.Windows.Forms.Panel(); | ||||||
|             this.tbTag = new System.Windows.Forms.TextBox(); |             this.tbTag = new System.Windows.Forms.TextBox(); | ||||||
|  |             this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); | ||||||
|  |             this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); | ||||||
|             hrsLabel = new System.Windows.Forms.Label(); |             hrsLabel = new System.Windows.Forms.Label(); | ||||||
|             typeLabel = new System.Windows.Forms.Label(); |             typeLabel = new System.Windows.Forms.Label(); | ||||||
|             label1 = new System.Windows.Forms.Label(); |             label1 = new System.Windows.Forms.Label(); | ||||||
| @@ -74,6 +77,7 @@ | |||||||
|             label3 = new System.Windows.Forms.Label(); |             label3 = new System.Windows.Forms.Label(); | ||||||
|             label6 = new System.Windows.Forms.Label(); |             label6 = new System.Windows.Forms.Label(); | ||||||
|             label2 = new System.Windows.Forms.Label(); |             label2 = new System.Windows.Forms.Label(); | ||||||
|  |             label7 = new System.Windows.Forms.Label(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); | ||||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); |             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); | ||||||
|             this.statusStrip1.SuspendLayout(); |             this.statusStrip1.SuspendLayout(); | ||||||
| @@ -83,7 +87,7 @@ | |||||||
|             // hrsLabel |             // hrsLabel | ||||||
|             //  |             //  | ||||||
|             hrsLabel.AutoSize = true; |             hrsLabel.AutoSize = true; | ||||||
|             hrsLabel.Location = new System.Drawing.Point(15, 98); |             hrsLabel.Location = new System.Drawing.Point(15, 99); | ||||||
|             hrsLabel.Name = "hrsLabel"; |             hrsLabel.Name = "hrsLabel"; | ||||||
|             hrsLabel.Size = new System.Drawing.Size(53, 12); |             hrsLabel.Size = new System.Drawing.Size(53, 12); | ||||||
|             hrsLabel.TabIndex = 16; |             hrsLabel.TabIndex = 16; | ||||||
| @@ -168,7 +172,7 @@ | |||||||
|             // label2 |             // label2 | ||||||
|             //  |             //  | ||||||
|             label2.AutoSize = true; |             label2.AutoSize = true; | ||||||
|             label2.Location = new System.Drawing.Point(155, 98); |             label2.Location = new System.Drawing.Point(155, 99); | ||||||
|             label2.Name = "label2"; |             label2.Name = "label2"; | ||||||
|             label2.Size = new System.Drawing.Size(53, 12); |             label2.Size = new System.Drawing.Size(53, 12); | ||||||
|             label2.TabIndex = 16; |             label2.TabIndex = 16; | ||||||
| @@ -178,21 +182,22 @@ | |||||||
|             //  |             //  | ||||||
|             this.lbSummary.AutoSize = true; |             this.lbSummary.AutoSize = true; | ||||||
|             this.lbSummary.ForeColor = System.Drawing.Color.SlateGray; |             this.lbSummary.ForeColor = System.Drawing.Color.SlateGray; | ||||||
|             this.lbSummary.Location = new System.Drawing.Point(298, 92); |             this.lbSummary.Location = new System.Drawing.Point(70, 136); | ||||||
|             this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); |             this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); | ||||||
|             this.lbSummary.Name = "lbSummary"; |             this.lbSummary.Name = "lbSummary"; | ||||||
|             this.lbSummary.Size = new System.Drawing.Size(195, 24); |             this.lbSummary.Size = new System.Drawing.Size(339, 12); | ||||||
|             this.lbSummary.TabIndex = 53; |             this.lbSummary.TabIndex = 53; | ||||||
|             this.lbSummary.Text = "금월 근무시간 : {0:N1}h / {1:N0}h\r\n금월 초과시간 : {2:N1}h"; |             this.lbSummary.Text = "금월 근무시간 : {0:N1}h / {1:N0}h , 금월 초과시간 : {2:N1}h"; | ||||||
|             //  |             //  | ||||||
|             // tbHrs |             // tbHrs | ||||||
|             //  |             //  | ||||||
|             this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); |             this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2")); | ||||||
|             this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); |             this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); | ||||||
|             this.tbHrs.Location = new System.Drawing.Point(72, 88); |             this.tbHrs.Location = new System.Drawing.Point(72, 89); | ||||||
|             this.tbHrs.Name = "tbHrs"; |             this.tbHrs.Name = "tbHrs"; | ||||||
|             this.tbHrs.Size = new System.Drawing.Size(77, 33); |             this.tbHrs.Size = new System.Drawing.Size(77, 39); | ||||||
|             this.tbHrs.TabIndex = 17; |             this.tbHrs.TabIndex = 17; | ||||||
|  |             this.tbHrs.Text = "0.0"; | ||||||
|             this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; |             this.tbHrs.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||||
|             //  |             //  | ||||||
|             // bs |             // bs | ||||||
| @@ -210,7 +215,7 @@ | |||||||
|             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { |             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { | ||||||
|             this.toolStripStatusLabel1, |             this.toolStripStatusLabel1, | ||||||
|             this.lbIndex}); |             this.lbIndex}); | ||||||
|             this.statusStrip1.Location = new System.Drawing.Point(0, 659); |             this.statusStrip1.Location = new System.Drawing.Point(0, 675); | ||||||
|             this.statusStrip1.Name = "statusStrip1"; |             this.statusStrip1.Name = "statusStrip1"; | ||||||
|             this.statusStrip1.Size = new System.Drawing.Size(969, 22); |             this.statusStrip1.Size = new System.Drawing.Size(969, 22); | ||||||
|             this.statusStrip1.TabIndex = 28; |             this.statusStrip1.TabIndex = 28; | ||||||
| @@ -286,13 +291,15 @@ | |||||||
|             // tbOt |             // tbOt | ||||||
|             //  |             //  | ||||||
|             this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true)); |             this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true)); | ||||||
|             this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); |             this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); | ||||||
|             this.tbOt.ForeColor = System.Drawing.Color.Red; |             this.tbOt.ForeColor = System.Drawing.Color.Red; | ||||||
|             this.tbOt.Location = new System.Drawing.Point(213, 88); |             this.tbOt.Location = new System.Drawing.Point(213, 89); | ||||||
|             this.tbOt.Name = "tbOt"; |             this.tbOt.Name = "tbOt"; | ||||||
|             this.tbOt.Size = new System.Drawing.Size(77, 33); |             this.tbOt.Size = new System.Drawing.Size(77, 39); | ||||||
|             this.tbOt.TabIndex = 17; |             this.tbOt.TabIndex = 17; | ||||||
|  |             this.tbOt.Text = "0.0"; | ||||||
|             this.tbOt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; |             this.tbOt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||||
|  |             this.tbOt.Validated += new System.EventHandler(this.tbOt_Validated); | ||||||
|             //  |             //  | ||||||
|             // tbWW |             // tbWW | ||||||
|             //  |             //  | ||||||
| @@ -400,19 +407,22 @@ | |||||||
|             this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; |             this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; | ||||||
|             this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; |             this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; | ||||||
|             this.richTextBoxEx1.FilePath = ""; |             this.richTextBoxEx1.FilePath = ""; | ||||||
|             this.richTextBoxEx1.Location = new System.Drawing.Point(0, 129); |             this.richTextBoxEx1.Location = new System.Drawing.Point(0, 156); | ||||||
|             this.richTextBoxEx1.Name = "richTextBoxEx1"; |             this.richTextBoxEx1.Name = "richTextBoxEx1"; | ||||||
|             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + |             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" + | ||||||
|     "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + |     "*\\generator Riched20 10.0.19041}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" + | ||||||
|     "Ex1\\par\r\n}\r\n"; |     "Ex1\\par\r\n}\r\n"; | ||||||
|             this.richTextBoxEx1.SetColorWithFont = true; |             this.richTextBoxEx1.SetColorWithFont = true; | ||||||
|             this.richTextBoxEx1.ShowToolStrip = true; |             this.richTextBoxEx1.ShowToolStrip = true; | ||||||
|             this.richTextBoxEx1.Size = new System.Drawing.Size(969, 509); |             this.richTextBoxEx1.Size = new System.Drawing.Size(969, 498); | ||||||
|             this.richTextBoxEx1.TabIndex = 58; |             this.richTextBoxEx1.TabIndex = 58; | ||||||
|             //  |             //  | ||||||
|             // panel1 |             // panel1 | ||||||
|             //  |             //  | ||||||
|             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); |             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); | ||||||
|  |             this.panel1.Controls.Add(this.dateTimePicker2); | ||||||
|  |             this.panel1.Controls.Add(this.dateTimePicker1); | ||||||
|  |             this.panel1.Controls.Add(label7); | ||||||
|             this.panel1.Controls.Add(this.dtPdate); |             this.panel1.Controls.Add(this.dtPdate); | ||||||
|             this.panel1.Controls.Add(this.tbHrs); |             this.panel1.Controls.Add(this.tbHrs); | ||||||
|             this.panel1.Controls.Add(this.tbProject); |             this.panel1.Controls.Add(this.tbProject); | ||||||
| @@ -441,23 +451,53 @@ | |||||||
|             this.panel1.Dock = System.Windows.Forms.DockStyle.Top; |             this.panel1.Dock = System.Windows.Forms.DockStyle.Top; | ||||||
|             this.panel1.Location = new System.Drawing.Point(0, 0); |             this.panel1.Location = new System.Drawing.Point(0, 0); | ||||||
|             this.panel1.Name = "panel1"; |             this.panel1.Name = "panel1"; | ||||||
|             this.panel1.Size = new System.Drawing.Size(969, 129); |             this.panel1.Size = new System.Drawing.Size(969, 156); | ||||||
|             this.panel1.TabIndex = 59; |             this.panel1.TabIndex = 59; | ||||||
|             //  |             //  | ||||||
|             // tbTag |             // tbTag | ||||||
|             //  |             //  | ||||||
|             this.tbTag.Dock = System.Windows.Forms.DockStyle.Bottom; |             this.tbTag.Dock = System.Windows.Forms.DockStyle.Bottom; | ||||||
|             this.tbTag.Location = new System.Drawing.Point(0, 638); |             this.tbTag.Location = new System.Drawing.Point(0, 654); | ||||||
|             this.tbTag.Name = "tbTag"; |             this.tbTag.Name = "tbTag"; | ||||||
|             this.tbTag.Size = new System.Drawing.Size(969, 21); |             this.tbTag.Size = new System.Drawing.Size(969, 21); | ||||||
|             this.tbTag.TabIndex = 60; |             this.tbTag.TabIndex = 60; | ||||||
|             this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; |             this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; | ||||||
|             //  |             //  | ||||||
|  |             // label7 | ||||||
|  |             //  | ||||||
|  |             label7.AutoSize = true; | ||||||
|  |             label7.Font = new System.Drawing.Font("맑은 고딕", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); | ||||||
|  |             label7.Location = new System.Drawing.Point(297, 91); | ||||||
|  |             label7.Name = "label7"; | ||||||
|  |             label7.Size = new System.Drawing.Size(73, 13); | ||||||
|  |             label7.TabIndex = 56; | ||||||
|  |             label7.Text = "초과시간정보"; | ||||||
|  |             //  | ||||||
|  |             // dateTimePicker1 | ||||||
|  |             //  | ||||||
|  |             this.dateTimePicker1.CustomFormat = "yyyy-MM-dd hh:mm:ss"; | ||||||
|  |             this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; | ||||||
|  |             this.dateTimePicker1.Location = new System.Drawing.Point(297, 105); | ||||||
|  |             this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4); | ||||||
|  |             this.dateTimePicker1.Name = "dateTimePicker1"; | ||||||
|  |             this.dateTimePicker1.Size = new System.Drawing.Size(153, 21); | ||||||
|  |             this.dateTimePicker1.TabIndex = 57; | ||||||
|  |             //  | ||||||
|  |             // dateTimePicker2 | ||||||
|  |             //  | ||||||
|  |             this.dateTimePicker2.CustomFormat = "yyyy-MM-dd hh:mm:ss"; | ||||||
|  |             this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom; | ||||||
|  |             this.dateTimePicker2.Location = new System.Drawing.Point(455, 105); | ||||||
|  |             this.dateTimePicker2.Margin = new System.Windows.Forms.Padding(4); | ||||||
|  |             this.dateTimePicker2.Name = "dateTimePicker2"; | ||||||
|  |             this.dateTimePicker2.Size = new System.Drawing.Size(153, 21); | ||||||
|  |             this.dateTimePicker2.TabIndex = 57; | ||||||
|  |             //  | ||||||
|             // fJobReport_Add |             // fJobReport_Add | ||||||
|             //  |             //  | ||||||
|             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); |             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); | ||||||
|             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; | ||||||
|             this.ClientSize = new System.Drawing.Size(969, 681); |             this.ClientSize = new System.Drawing.Size(969, 697); | ||||||
|             this.Controls.Add(this.richTextBoxEx1); |             this.Controls.Add(this.richTextBoxEx1); | ||||||
|             this.Controls.Add(this.tbTag); |             this.Controls.Add(this.tbTag); | ||||||
|             this.Controls.Add(this.panel1); |             this.Controls.Add(this.panel1); | ||||||
| @@ -506,5 +546,7 @@ | |||||||
|         private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; |         private RichTextBoxEx.RichTextBoxEx richTextBoxEx1; | ||||||
|         private System.Windows.Forms.Panel panel1; |         private System.Windows.Forms.Panel panel1; | ||||||
|         private System.Windows.Forms.TextBox tbTag; |         private System.Windows.Forms.TextBox tbTag; | ||||||
|  |         private System.Windows.Forms.DateTimePicker dateTimePicker1; | ||||||
|  |         private System.Windows.Forms.DateTimePicker dateTimePicker2; | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -63,6 +63,8 @@ namespace FPJ0000.JobReport_ | |||||||
|         { |         { | ||||||
|             //사용자목록 |             //사용자목록 | ||||||
|             this.bs.DataSource = dr; |             this.bs.DataSource = dr; | ||||||
|  |             this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm"; | ||||||
|  |             this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm"; | ||||||
|  |  | ||||||
|             //해당 사용자에 걸린 프로젝트 목록 가져오기 |             //해당 사용자에 걸린 프로젝트 목록 가져오기 | ||||||
|             var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK); |             var userProject = FCOMMON.DBM.getUserProjectList(FCOMMON.info.Login.nameK); | ||||||
| @@ -119,9 +121,25 @@ namespace FPJ0000.JobReport_ | |||||||
|             cmbProcess.SelectedValue = dr.process; |             cmbProcess.SelectedValue = dr.process; | ||||||
|             tbTag.Text = dr.tag; |             tbTag.Text = dr.tag; | ||||||
|  |  | ||||||
|  |             if (dr.IsotStartNull()) dateTimePicker1.Value = DateTime.Now; | ||||||
|  |             else dateTimePicker1.Value = dr.otStart; | ||||||
|  |             if (dr.IsotEndNull()) dateTimePicker2.Value = DateTime.Now; | ||||||
|  |             else dateTimePicker2.Value = dr.otEnd; | ||||||
|  |  | ||||||
|             //if (cmbRequest.Text == "") cmbRequest.Text = "EE1"; |             //if (cmbRequest.Text == "") cmbRequest.Text = "EE1"; | ||||||
|             if (cmbPackage.Text == "") cmbPackage.Text = "Common"; |             if (cmbPackage.Text == "") cmbPackage.Text = "Common"; | ||||||
|  |  | ||||||
|  |             if (dr.ot != 0) | ||||||
|  |             { | ||||||
|  |                 dateTimePicker1.Enabled = true; | ||||||
|  |                 dateTimePicker2.Enabled = true; | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 dateTimePicker1.Enabled = false; | ||||||
|  |                 dateTimePicker2.Enabled = false; | ||||||
|  |             } | ||||||
|  |  | ||||||
|             //프로젝트 번호 확인(프로젝트번호가 바뀌면 데이터를 업데이트 해준다) |             //프로젝트 번호 확인(프로젝트번호가 바뀌면 데이터를 업데이트 해준다) | ||||||
|             if (dr.IspidxNull()) |             if (dr.IspidxNull()) | ||||||
|             { |             { | ||||||
| @@ -372,6 +390,38 @@ namespace FPJ0000.JobReport_ | |||||||
|                 return; |                 return; | ||||||
|             } |             } | ||||||
|  |  | ||||||
|  |             if (double.TryParse(tbOt.Text, out double ot)) | ||||||
|  |             { | ||||||
|  |                 var timeterm = dateTimePicker2.Value - dateTimePicker1.Value; | ||||||
|  |                 if ((timeterm.TotalMinutes + 1) * 60 <= ot) | ||||||
|  |                 { | ||||||
|  |                     FCOMMON.Util.MsgE($"OT시간이 지정된 시간대보다 부족합니다.\nOT시간정보를 확인하세요\n" + | ||||||
|  |                         $"\n입력시간범위 : {dateTimePicker1.Value.ToString("HH:mm:ss")}~{dateTimePicker2.Value.ToString("HH:mm:ss")}" + | ||||||
|  |                         $"\n입력시간(시) : {timeterm.TotalMinutes * 60}"); | ||||||
|  |                     dateTimePicker1.Focus(); | ||||||
|  |                     return; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 dr.ot = ot; | ||||||
|  |                 if(ot == 0) | ||||||
|  |                 { | ||||||
|  |                     dr.SetotStartNull(); | ||||||
|  |                     dr.SetotEndNull(); | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     dr.otStart = dateTimePicker1.Value; | ||||||
|  |                     dr.otEnd = dateTimePicker2.Value; | ||||||
|  |                 } | ||||||
|  |          | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 dr.ot = 0; | ||||||
|  |                 dr.SetotStartNull(); | ||||||
|  |                 dr.SetotEndNull(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|             //if(hrs2 > 8) |             //if(hrs2 > 8) | ||||||
|             //{ |             //{ | ||||||
|             //    FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요"); |             //    FCOMMON.Util.MsgE("1일 최대근무시간은 8시간을 초과할 수 없습니다\n초과시간을 사용하세요"); | ||||||
| @@ -393,8 +443,7 @@ namespace FPJ0000.JobReport_ | |||||||
|             this.dr.tag = tbTag.Text.Trim(); |             this.dr.tag = tbTag.Text.Trim(); | ||||||
|             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text); |             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text); | ||||||
|             else this.dr.hrs = 0; |             else this.dr.hrs = 0; | ||||||
|             if (tbOt.Text != "") this.dr.ot = double.Parse(tbOt.Text); |  | ||||||
|             else this.dr.ot = 0; |  | ||||||
|             //this.dr.description = richTextBox1.Text.Trim(); |             //this.dr.description = richTextBox1.Text.Trim(); | ||||||
|  |  | ||||||
|             //MessageBox.Show(richTextBox1.Text); |             //MessageBox.Show(richTextBox1.Text); | ||||||
| @@ -453,22 +502,22 @@ namespace FPJ0000.JobReport_ | |||||||
|                         { |                         { | ||||||
|                             //뭔가 자료가 있는가?                             |                             //뭔가 자료가 있는가?                             | ||||||
|                             var header = string.Empty; |                             var header = string.Empty; | ||||||
|          |  | ||||||
|  |  | ||||||
|                             var rt = new RichTextBoxEx.RichTextBoxEx(); |                             var rt = new RichTextBoxEx.RichTextBoxEx(); | ||||||
|                             rt.Rtf = dr.body;                             |                             rt.Rtf = dr.body; | ||||||
|                             if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim(); |                             if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim(); | ||||||
|                             else header = rt.Text.Trim(); |                             else header = rt.Text.Trim(); | ||||||
|                             rt.Dispose(); |                             rt.Dispose(); | ||||||
|  |  | ||||||
|                             if (this.richTextBoxEx1.Text.StartsWith(header) ==false) |                             if (this.richTextBoxEx1.Text.StartsWith(header) == false) | ||||||
|                             { |                             { | ||||||
|                                 //if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) |                                 //if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) | ||||||
|                                 { |                                 { | ||||||
|                                     var oldtext = this.richTextBoxEx1.Text; |                                     var oldtext = this.richTextBoxEx1.Text; | ||||||
|                                     this.richTextBoxEx1.Rtf = dr.body; |                                     this.richTextBoxEx1.Rtf = dr.body; | ||||||
|                                     if (this.richTextBoxEx1.Text.isEmpty() == false) |                                     if (this.richTextBoxEx1.Text.isEmpty() == false) | ||||||
|                                         this.richTextBoxEx1.Text +=  "\r\n\r\n"+oldtext; |                                         this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext; | ||||||
|  |  | ||||||
|                                     //this.richTextBoxEx1.Text += oldtext; |                                     //this.richTextBoxEx1.Text += oldtext; | ||||||
|  |  | ||||||
| @@ -517,7 +566,7 @@ namespace FPJ0000.JobReport_ | |||||||
|                 float work, ot; |                 float work, ot; | ||||||
|                 int total; |                 int total; | ||||||
|                 FCOMMON.DBM.getWorkTime(cmbUser.SelectedValue.ToString(), dtPdate.Value.ToString("yyyy-MM"), out work, out total, out ot); |                 FCOMMON.DBM.getWorkTime(cmbUser.SelectedValue.ToString(), dtPdate.Value.ToString("yyyy-MM"), out work, out total, out ot); | ||||||
|                 string msg = "금월 근무시간 : {0:N1}h / {1:N0}h\n금월 초과시간 : {2:N1}h"; |                 string msg = "금월 근무시간 : {0:N1}h / {1:N0}h, 금월 초과시간 : {2:N1}h"; | ||||||
|                 lbSummary.Text = string.Format(msg, work, total, ot); |                 lbSummary.Text = string.Format(msg, work, total, ot); | ||||||
|             } |             } | ||||||
|             else |             else | ||||||
| @@ -531,5 +580,39 @@ namespace FPJ0000.JobReport_ | |||||||
|                 UpdateWOrkTime(); ; |                 UpdateWOrkTime(); ; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         private void tbOt_Validated(object sender, EventArgs e) | ||||||
|  |         { | ||||||
|  |             if (double.TryParse(tbOt.Text, out double ot)) | ||||||
|  |             { | ||||||
|  |                 if (ot != 0) | ||||||
|  |                 { | ||||||
|  |  | ||||||
|  |                     dateTimePicker1.Enabled = true; | ||||||
|  |                     dateTimePicker2.Enabled = true; | ||||||
|  |  | ||||||
|  |                     //신규데이터라면 자동으로 시간을 설정해준다 | ||||||
|  |                     if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached) | ||||||
|  |                     { | ||||||
|  |                         if (dateTimePicker1.Value == dateTimePicker2.Value) | ||||||
|  |                         { | ||||||
|  |                             dateTimePicker1.Value = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd" + " 18:00:00")); | ||||||
|  |                             dateTimePicker2.Value = dateTimePicker1.Value.AddHours(ot); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     dateTimePicker1.Enabled = false; | ||||||
|  |                     dateTimePicker2.Enabled = false; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 dateTimePicker1.Enabled = false; | ||||||
|  |                 dateTimePicker2.Enabled = false; | ||||||
|  |  | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -168,4 +168,7 @@ | |||||||
|   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>226, 17</value> |     <value>226, 17</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|  |   <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | ||||||
|  |     <value>False</value> | ||||||
|  |   </metadata> | ||||||
| </root> | </root> | ||||||
							
								
								
									
										667
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										667
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -3575,6 +3575,12 @@ namespace FPJ0000 { | |||||||
|              |              | ||||||
|             private global::System.Data.DataColumn columnsvalue; |             private global::System.Data.DataColumn columnsvalue; | ||||||
|              |              | ||||||
|  |             private global::System.Data.DataColumn columnotStart; | ||||||
|  |              | ||||||
|  |             private global::System.Data.DataColumn columnotEnd; | ||||||
|  |              | ||||||
|  |             private global::System.Data.DataColumn columnautoinput; | ||||||
|  |              | ||||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|             public JobReportDataTable() { |             public JobReportDataTable() { | ||||||
| @@ -3800,6 +3806,30 @@ namespace FPJ0000 { | |||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|              |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public global::System.Data.DataColumn otStartColumn { | ||||||
|  |                 get { | ||||||
|  |                     return this.columnotStart; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public global::System.Data.DataColumn otEndColumn { | ||||||
|  |                 get { | ||||||
|  |                     return this.columnotEnd; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public global::System.Data.DataColumn autoinputColumn { | ||||||
|  |                 get { | ||||||
|  |                     return this.columnautoinput; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|             [global::System.ComponentModel.Browsable(false)] |             [global::System.ComponentModel.Browsable(false)] | ||||||
| @@ -3860,7 +3890,10 @@ namespace FPJ0000 { | |||||||
|                         string gcode,  |                         string gcode,  | ||||||
|                         string description2,  |                         string description2,  | ||||||
|                         string tag,  |                         string tag,  | ||||||
|                         string svalue) { |                         string svalue,  | ||||||
|  |                         System.DateTime otStart,  | ||||||
|  |                         System.DateTime otEnd,  | ||||||
|  |                         bool autoinput) { | ||||||
|                 JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); |                 JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); | ||||||
|                 object[] columnValuesArray = new object[] { |                 object[] columnValuesArray = new object[] { | ||||||
|                         null, |                         null, | ||||||
| @@ -3886,7 +3919,10 @@ namespace FPJ0000 { | |||||||
|                         gcode, |                         gcode, | ||||||
|                         description2, |                         description2, | ||||||
|                         tag, |                         tag, | ||||||
|                         svalue}; |                         svalue, | ||||||
|  |                         otStart, | ||||||
|  |                         otEnd, | ||||||
|  |                         autoinput}; | ||||||
|                 rowJobReportRow.ItemArray = columnValuesArray; |                 rowJobReportRow.ItemArray = columnValuesArray; | ||||||
|                 this.Rows.Add(rowJobReportRow); |                 this.Rows.Add(rowJobReportRow); | ||||||
|                 return rowJobReportRow; |                 return rowJobReportRow; | ||||||
| @@ -3940,6 +3976,9 @@ namespace FPJ0000 { | |||||||
|                 this.columndescription2 = base.Columns["description2"]; |                 this.columndescription2 = base.Columns["description2"]; | ||||||
|                 this.columntag = base.Columns["tag"]; |                 this.columntag = base.Columns["tag"]; | ||||||
|                 this.columnsvalue = base.Columns["svalue"]; |                 this.columnsvalue = base.Columns["svalue"]; | ||||||
|  |                 this.columnotStart = base.Columns["otStart"]; | ||||||
|  |                 this.columnotEnd = base.Columns["otEnd"]; | ||||||
|  |                 this.columnautoinput = base.Columns["autoinput"]; | ||||||
|             } |             } | ||||||
|              |              | ||||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
| @@ -3993,6 +4032,12 @@ namespace FPJ0000 { | |||||||
|                 base.Columns.Add(this.columntag); |                 base.Columns.Add(this.columntag); | ||||||
|                 this.columnsvalue = new global::System.Data.DataColumn("svalue", typeof(string), null, global::System.Data.MappingType.Element); |                 this.columnsvalue = new global::System.Data.DataColumn("svalue", typeof(string), null, global::System.Data.MappingType.Element); | ||||||
|                 base.Columns.Add(this.columnsvalue); |                 base.Columns.Add(this.columnsvalue); | ||||||
|  |                 this.columnotStart = new global::System.Data.DataColumn("otStart", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); | ||||||
|  |                 base.Columns.Add(this.columnotStart); | ||||||
|  |                 this.columnotEnd = new global::System.Data.DataColumn("otEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); | ||||||
|  |                 base.Columns.Add(this.columnotEnd); | ||||||
|  |                 this.columnautoinput = new global::System.Data.DataColumn("autoinput", typeof(bool), null, global::System.Data.MappingType.Element); | ||||||
|  |                 base.Columns.Add(this.columnautoinput); | ||||||
|                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { |                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { | ||||||
|                                 this.columnidx}, true)); |                                 this.columnidx}, true)); | ||||||
|                 this.columnidx.AutoIncrement = true; |                 this.columnidx.AutoIncrement = true; | ||||||
| @@ -13771,6 +13816,54 @@ namespace FPJ0000 { | |||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|              |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public System.DateTime otStart { | ||||||
|  |                 get { | ||||||
|  |                     try { | ||||||
|  |                         return ((global::System.DateTime)(this[this.tableJobReport.otStartColumn])); | ||||||
|  |                     } | ||||||
|  |                     catch (global::System.InvalidCastException e) { | ||||||
|  |                         throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'otStart\' 열의 값이 DBNull입니다.", e); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 set { | ||||||
|  |                     this[this.tableJobReport.otStartColumn] = value; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public System.DateTime otEnd { | ||||||
|  |                 get { | ||||||
|  |                     try { | ||||||
|  |                         return ((global::System.DateTime)(this[this.tableJobReport.otEndColumn])); | ||||||
|  |                     } | ||||||
|  |                     catch (global::System.InvalidCastException e) { | ||||||
|  |                         throw new global::System.Data.StrongTypingException("\'JobReport\' 테이블의 \'otEnd\' 열의 값이 DBNull입니다.", e); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 set { | ||||||
|  |                     this[this.tableJobReport.otEndColumn] = value; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public bool autoinput { | ||||||
|  |                 get { | ||||||
|  |                     if (this.IsautoinputNull()) { | ||||||
|  |                         return false; | ||||||
|  |                     } | ||||||
|  |                     else { | ||||||
|  |                         return ((bool)(this[this.tableJobReport.autoinputColumn])); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 set { | ||||||
|  |                     this[this.tableJobReport.autoinputColumn] = value; | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |              | ||||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|             public bool IspdateNull() { |             public bool IspdateNull() { | ||||||
| @@ -14010,6 +14103,42 @@ namespace FPJ0000 { | |||||||
|             public void SetsvalueNull() { |             public void SetsvalueNull() { | ||||||
|                 this[this.tableJobReport.svalueColumn] = global::System.Convert.DBNull; |                 this[this.tableJobReport.svalueColumn] = global::System.Convert.DBNull; | ||||||
|             } |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public bool IsotStartNull() { | ||||||
|  |                 return this.IsNull(this.tableJobReport.otStartColumn); | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public void SetotStartNull() { | ||||||
|  |                 this[this.tableJobReport.otStartColumn] = global::System.Convert.DBNull; | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public bool IsotEndNull() { | ||||||
|  |                 return this.IsNull(this.tableJobReport.otEndColumn); | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public void SetotEndNull() { | ||||||
|  |                 this[this.tableJobReport.otEndColumn] = global::System.Convert.DBNull; | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public bool IsautoinputNull() { | ||||||
|  |                 return this.IsNull(this.tableJobReport.autoinputColumn); | ||||||
|  |             } | ||||||
|  |              | ||||||
|  |             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|  |             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|  |             public void SetautoinputNull() { | ||||||
|  |                 this[this.tableJobReport.autoinputColumn] = global::System.Convert.DBNull; | ||||||
|  |             } | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         /// <summary> |         /// <summary> | ||||||
| @@ -24677,10 +24806,31 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; | |||||||
|             tableMapping.ColumnMappings.Add("description2", "description2"); |             tableMapping.ColumnMappings.Add("description2", "description2"); | ||||||
|             tableMapping.ColumnMappings.Add("tag", "tag"); |             tableMapping.ColumnMappings.Add("tag", "tag"); | ||||||
|             tableMapping.ColumnMappings.Add("svalue", "svalue"); |             tableMapping.ColumnMappings.Add("svalue", "svalue"); | ||||||
|  |             tableMapping.ColumnMappings.Add("otStart", "otStart"); | ||||||
|  |             tableMapping.ColumnMappings.Add("otEnd", "otEnd"); | ||||||
|  |             tableMapping.ColumnMappings.Add("autoinput", "autoinput"); | ||||||
|             this._adapter.TableMappings.Add(tableMapping); |             this._adapter.TableMappings.Add(tableMapping); | ||||||
|             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); |             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); | ||||||
|             this._adapter.DeleteCommand.Connection = this.Connection; |             this._adapter.DeleteCommand.Connection = this.Connection; | ||||||
|             this._adapter.DeleteCommand.CommandText = @"DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)))"; |             this._adapter.DeleteCommand.CommandText = "DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND" + | ||||||
|  |                 " [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdat" + | ||||||
|  |                 "e] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS N" + | ||||||
|  |                 "ULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart]" + | ||||||
|  |                 " IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 " + | ||||||
|  |                 "AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status " + | ||||||
|  |                 "= 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type =" + | ||||||
|  |                 " 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AN" + | ||||||
|  |                 "D [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND " + | ||||||
|  |                 "[hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import]" + | ||||||
|  |                 " IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([" + | ||||||
|  |                 "wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NUL" + | ||||||
|  |                 "L) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS " + | ||||||
|  |                 "NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL)" + | ||||||
|  |                 " OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNu" + | ||||||
|  |                 "ll_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart " + | ||||||
|  |                 "= 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otE" + | ||||||
|  |                 "nd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoin" + | ||||||
|  |                 "put = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)))"; | ||||||
|             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; |             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
| @@ -24704,67 +24854,142 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; | |||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); |             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); | ||||||
|             this._adapter.InsertCommand.Connection = this.Connection; |             this._adapter.InsertCommand.Connection = this.Connection; | ||||||
|             this._adapter.InsertCommand.CommandText = @"INSERT INTO JobReport
 |             this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [gcode], [description2], [tag], [otStart], [otEnd], [autoinput]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @gcode, @description2, @tag, @otStart, @otEnd, @autoinput);
 | ||||||
|                (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag) | SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
 | ||||||
| VALUES  (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag);    |  | ||||||
| SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
 |  | ||||||
|             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; |             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.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._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); |             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); | ||||||
|             this._adapter.UpdateCommand.Connection = this.Connection; |             this._adapter.UpdateCommand.Connection = this.Connection; | ||||||
|             this._adapter.UpdateCommand.CommandText = @"UPDATE JobReport
 |             this._adapter.UpdateCommand.CommandText = "UPDATE [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpa" + | ||||||
| SET        pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs,  |                 "rt] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [d" + | ||||||
|                import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag |                 "escription] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import" + | ||||||
| WHERE  (idx = @Original_idx);    |                 ", [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [p" + | ||||||
| SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC";
 |                 "rocess] = @process, [gcode] = @gcode, [description2] = @description2, [tag] = @t" + | ||||||
|  |                 "ag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput WHERE (([id" + | ||||||
|  |                 "x] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Ori" + | ||||||
|  |                 "ginal_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Origina" + | ||||||
|  |                 "l_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) A" + | ||||||
|  |                 "ND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Ori" + | ||||||
|  |                 "ginal_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([packag" + | ||||||
|  |                 "e] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([sta" + | ||||||
|  |                 "tus] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] " + | ||||||
|  |                 "= @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] =" + | ||||||
|  |                 " @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Origin" + | ||||||
|  |                 "al_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original" + | ||||||
|  |                 "_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@I" + | ||||||
|  |                 "sNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_p" + | ||||||
|  |                 "rojectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AN" + | ||||||
|  |                 "D ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process" + | ||||||
|  |                 ")) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR (" + | ||||||
|  |                 "[tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([ot" + | ||||||
|  |                 "Start] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([o" + | ||||||
|  |                 "tEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) O" + | ||||||
|  |                 "R ([autoinput] = @Original_autoinput)));\r\nSELECT idx, pidx, pdate, uid, requestp" + | ||||||
|  |                 "art, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.g" + | ||||||
|  |                 "etUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, proc" + | ||||||
|  |                 "ess, gcode, description2, tag, dbo.getCodeSValue(gcode, \'15\', type) AS svalue, o" + | ||||||
|  |                 "tStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC"; | ||||||
|             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; |             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|  |             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
| @@ -24781,7 +25006,7 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r | |||||||
|             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); |             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); | ||||||
|             this._commandCollection[0].Connection = this.Connection; |             this._commandCollection[0].Connection = this.Connection; | ||||||
|             this._commandCollection[0].CommandText = @"SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, 
 |             this._commandCollection[0].CommandText = @"SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, 
 | ||||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue |                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput | ||||||
| FROM     JobReport | FROM     JobReport | ||||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | ||||||
| ORDER BY pdate DESC";
 | ORDER BY pdate DESC";
 | ||||||
| @@ -24809,11 +25034,7 @@ ORDER BY pdate DESC"; | |||||||
|             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); |             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||||
|             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); |             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); | ||||||
|             this._commandCollection[3].Connection = this.Connection; |             this._commandCollection[3].Connection = this.Connection; | ||||||
|             this._commandCollection[3].CommandText = @"SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, 
 |             this._commandCollection[3].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC"; | ||||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue |  | ||||||
| FROM     JobReport |  | ||||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') |  | ||||||
| ORDER BY pdate DESC";
 |  | ||||||
|             this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; |             this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; | ||||||
|             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
|             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); |             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); | ||||||
| @@ -25157,7 +25378,12 @@ ORDER BY projectName"; | |||||||
|                     System.DateTime Original_wdate,  |                     System.DateTime Original_wdate,  | ||||||
|                     string Original_projectName,  |                     string Original_projectName,  | ||||||
|                     global::System.Nullable<double> Original_ot,  |                     global::System.Nullable<double> Original_ot,  | ||||||
|                     string Original_process) { |                     string Original_process,  | ||||||
|  |                     string Original_gcode,  | ||||||
|  |                     string Original_tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otEnd,  | ||||||
|  |                     global::System.Nullable<bool> Original_autoinput) { | ||||||
|             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); |             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); | ||||||
|             if ((Original_pidx.HasValue == true)) { |             if ((Original_pidx.HasValue == true)) { | ||||||
|                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); |                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); | ||||||
| @@ -25270,6 +25496,44 @@ ORDER BY projectName"; | |||||||
|                 this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); |                 this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); | ||||||
|                 this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_process)); |                 this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_process)); | ||||||
|             } |             } | ||||||
|  |             if ((Original_gcode == null)) { | ||||||
|  |                 throw new global::System.ArgumentNullException("Original_gcode"); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[29].Value = ((string)(Original_gcode)); | ||||||
|  |             } | ||||||
|  |             if ((Original_tag == null)) { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[31].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[30].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[31].Value = ((string)(Original_tag)); | ||||||
|  |             } | ||||||
|  |             if ((Original_otStart.HasValue == true)) { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[33].Value = ((System.DateTime)(Original_otStart.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[32].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[33].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_otEnd.HasValue == true)) { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[35].Value = ((System.DateTime)(Original_otEnd.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[34].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[35].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_autoinput.HasValue == true)) { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[37].Value = ((bool)(Original_autoinput.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.DeleteCommand.Parameters[37].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; |             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; | ||||||
|             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)  |             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)  | ||||||
|                         != global::System.Data.ConnectionState.Open)) { |                         != global::System.Data.ConnectionState.Open)) { | ||||||
| @@ -25309,7 +25573,10 @@ ORDER BY projectName"; | |||||||
|                     string process,  |                     string process,  | ||||||
|                     string gcode,  |                     string gcode,  | ||||||
|                     string description2,  |                     string description2,  | ||||||
|                     string tag) { |                     string tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otEnd,  | ||||||
|  |                     global::System.Nullable<bool> autoinput) { | ||||||
|             if ((pidx.HasValue == true)) { |             if ((pidx.HasValue == true)) { | ||||||
|                 this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value)); |                 this.Adapter.InsertCommand.Parameters[0].Value = ((int)(pidx.Value)); | ||||||
|             } |             } | ||||||
| @@ -25419,6 +25686,24 @@ ORDER BY projectName"; | |||||||
|             else { |             else { | ||||||
|                 this.Adapter.InsertCommand.Parameters[18].Value = ((string)(tag)); |                 this.Adapter.InsertCommand.Parameters[18].Value = ((string)(tag)); | ||||||
|             } |             } | ||||||
|  |             if ((otStart.HasValue == true)) { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[19].Value = ((System.DateTime)(otStart.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[19].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((otEnd.HasValue == true)) { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[20].Value = ((System.DateTime)(otEnd.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[20].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((autoinput.HasValue == true)) { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[21].Value = ((bool)(autoinput.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; |             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; | ||||||
|             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)  |             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)  | ||||||
|                         != global::System.Data.ConnectionState.Open)) { |                         != global::System.Data.ConnectionState.Open)) { | ||||||
| @@ -25456,9 +25741,33 @@ ORDER BY projectName"; | |||||||
|                     string projectName,  |                     string projectName,  | ||||||
|                     global::System.Nullable<double> ot,  |                     global::System.Nullable<double> ot,  | ||||||
|                     string process,  |                     string process,  | ||||||
|  |                     string gcode,  | ||||||
|                     string description2,  |                     string description2,  | ||||||
|                     string tag,  |                     string tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otEnd,  | ||||||
|  |                     global::System.Nullable<bool> autoinput,  | ||||||
|                     int Original_idx,  |                     int Original_idx,  | ||||||
|  |                     global::System.Nullable<int> Original_pidx,  | ||||||
|  |                     string Original_pdate,  | ||||||
|  |                     string Original_uid,  | ||||||
|  |                     string Original_requestpart,  | ||||||
|  |                     string Original_package,  | ||||||
|  |                     string Original_status,  | ||||||
|  |                     string Original_type,  | ||||||
|  |                     string Original_remark,  | ||||||
|  |                     global::System.Nullable<double> Original_hrs,  | ||||||
|  |                     global::System.Nullable<bool> Original_import,  | ||||||
|  |                     string Original_wuid,  | ||||||
|  |                     System.DateTime Original_wdate,  | ||||||
|  |                     string Original_projectName,  | ||||||
|  |                     global::System.Nullable<double> Original_ot,  | ||||||
|  |                     string Original_process,  | ||||||
|  |                     string Original_gcode,  | ||||||
|  |                     string Original_tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otEnd,  | ||||||
|  |                     global::System.Nullable<bool> Original_autoinput,  | ||||||
|                     int idx) { |                     int idx) { | ||||||
|             if ((pidx.HasValue == true)) { |             if ((pidx.HasValue == true)) { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx.Value)); |                 this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(pidx.Value)); | ||||||
| @@ -25551,20 +25860,193 @@ ORDER BY projectName"; | |||||||
|             else { |             else { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(process)); |                 this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(process)); | ||||||
|             } |             } | ||||||
|             if ((description2 == null)) { |             if ((gcode == null)) { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; |                 throw new global::System.ArgumentNullException("gcode"); | ||||||
|             } |             } | ||||||
|             else { |             else { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(description2)); |                 this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(gcode)); | ||||||
|             } |             } | ||||||
|             if ((tag == null)) { |             if ((description2 == null)) { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; |                 this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; | ||||||
|             } |             } | ||||||
|             else { |             else { | ||||||
|                 this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(tag)); |                 this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(description2)); | ||||||
|             } |             } | ||||||
|             this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); |             if ((tag == null)) { | ||||||
|             this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idx)); |                 this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(tag)); | ||||||
|  |             } | ||||||
|  |             if ((otStart.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(otStart.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((otEnd.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(otEnd.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((autoinput.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[21].Value = ((bool)(autoinput.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx)); | ||||||
|  |             if ((Original_pidx.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_pidx.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_pdate == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_pdate)); | ||||||
|  |             } | ||||||
|  |             if ((Original_uid == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_uid)); | ||||||
|  |             } | ||||||
|  |             if ((Original_requestpart == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_requestpart)); | ||||||
|  |             } | ||||||
|  |             if ((Original_package == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_package)); | ||||||
|  |             } | ||||||
|  |             if ((Original_status == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_status)); | ||||||
|  |             } | ||||||
|  |             if ((Original_type == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_type)); | ||||||
|  |             } | ||||||
|  |             if ((Original_remark == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_remark)); | ||||||
|  |             } | ||||||
|  |             if ((Original_hrs.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[40].Value = ((double)(Original_hrs.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_import.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[42].Value = ((bool)(Original_import.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_wuid == null)) { | ||||||
|  |                 throw new global::System.ArgumentNullException("Original_wuid"); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_wuid)); | ||||||
|  |             } | ||||||
|  |             this.Adapter.UpdateCommand.Parameters[44].Value = ((System.DateTime)(Original_wdate)); | ||||||
|  |             if ((Original_projectName == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_projectName)); | ||||||
|  |             } | ||||||
|  |             if ((Original_ot.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[48].Value = ((double)(Original_ot.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_process == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_process)); | ||||||
|  |             } | ||||||
|  |             if ((Original_gcode == null)) { | ||||||
|  |                 throw new global::System.ArgumentNullException("Original_gcode"); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_gcode)); | ||||||
|  |             } | ||||||
|  |             if ((Original_tag == null)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_tag)); | ||||||
|  |             } | ||||||
|  |             if ((Original_otStart.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[55].Value = ((System.DateTime)(Original_otStart.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_otEnd.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[57].Value = ((System.DateTime)(Original_otEnd.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             if ((Original_autoinput.HasValue == true)) { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[59].Value = ((bool)(Original_autoinput.Value)); | ||||||
|  |             } | ||||||
|  |             else { | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1)); | ||||||
|  |                 this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value; | ||||||
|  |             } | ||||||
|  |             this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(idx)); | ||||||
|             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; |             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; | ||||||
|             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)  |             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)  | ||||||
|                         != global::System.Data.ConnectionState.Open)) { |                         != global::System.Data.ConnectionState.Open)) { | ||||||
| @@ -25581,6 +26063,57 @@ ORDER BY projectName"; | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|          |          | ||||||
|  |         [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.Update, true)] | ||||||
|  |         public virtual int Update( | ||||||
|  |                     global::System.Nullable<int> pidx,  | ||||||
|  |                     string pdate,  | ||||||
|  |                     string uid,  | ||||||
|  |                     string requestpart,  | ||||||
|  |                     string package,  | ||||||
|  |                     string status,  | ||||||
|  |                     string type,  | ||||||
|  |                     string description,  | ||||||
|  |                     string remark,  | ||||||
|  |                     global::System.Nullable<double> hrs,  | ||||||
|  |                     global::System.Nullable<bool> import,  | ||||||
|  |                     string wuid,  | ||||||
|  |                     System.DateTime wdate,  | ||||||
|  |                     string projectName,  | ||||||
|  |                     global::System.Nullable<double> ot,  | ||||||
|  |                     string process,  | ||||||
|  |                     string gcode,  | ||||||
|  |                     string description2,  | ||||||
|  |                     string tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> otEnd,  | ||||||
|  |                     global::System.Nullable<bool> autoinput,  | ||||||
|  |                     int Original_idx,  | ||||||
|  |                     global::System.Nullable<int> Original_pidx,  | ||||||
|  |                     string Original_pdate,  | ||||||
|  |                     string Original_uid,  | ||||||
|  |                     string Original_requestpart,  | ||||||
|  |                     string Original_package,  | ||||||
|  |                     string Original_status,  | ||||||
|  |                     string Original_type,  | ||||||
|  |                     string Original_remark,  | ||||||
|  |                     global::System.Nullable<double> Original_hrs,  | ||||||
|  |                     global::System.Nullable<bool> Original_import,  | ||||||
|  |                     string Original_wuid,  | ||||||
|  |                     System.DateTime Original_wdate,  | ||||||
|  |                     string Original_projectName,  | ||||||
|  |                     global::System.Nullable<double> Original_ot,  | ||||||
|  |                     string Original_process,  | ||||||
|  |                     string Original_gcode,  | ||||||
|  |                     string Original_tag,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otStart,  | ||||||
|  |                     global::System.Nullable<global::System.DateTime> Original_otEnd,  | ||||||
|  |                     global::System.Nullable<bool> Original_autoinput) { | ||||||
|  |             return this.Update(pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag, otStart, otEnd, autoinput, Original_idx, Original_pidx, Original_pdate, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_remark, Original_hrs, Original_import, Original_wuid, Original_wdate, Original_projectName, Original_ot, Original_process, Original_gcode, Original_tag, Original_otStart, Original_otEnd, Original_autoinput, Original_idx); | ||||||
|  |         } | ||||||
|  |          | ||||||
|         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||||
|         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] |         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||||
|         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] |         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] | ||||||
|   | |||||||
| @@ -768,7 +768,7 @@ WHERE  (Project = @pidx)</CommandText> | |||||||
|               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill"> |               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill"> | ||||||
|                 <DeleteCommand> |                 <DeleteCommand> | ||||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> |                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||||
|                     <CommandText>DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)))</CommandText> |                     <CommandText>DELETE FROM [JobReport] WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)))</CommandText> | ||||||
|                     <Parameters> |                     <Parameters> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
| @@ -792,49 +792,59 @@ WHERE  (Project = @pidx)</CommandText> | |||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tag" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otStart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otEnd" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_autoinput" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|                     </Parameters> |                     </Parameters> | ||||||
|                   </DbCommand> |                   </DbCommand> | ||||||
|                 </DeleteCommand> |                 </DeleteCommand> | ||||||
|                 <InsertCommand> |                 <InsertCommand> | ||||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> |                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||||
|                     <CommandText>INSERT INTO JobReport |                     <CommandText>INSERT INTO [JobReport] ([pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [gcode], [description2], [tag], [otStart], [otEnd], [autoinput]) VALUES (@pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @gcode, @description2, @tag, @otStart, @otEnd, @autoinput); | ||||||
|                (pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, gcode, description2, tag) | SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText> | ||||||
| VALUES  (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag);    |  | ||||||
| SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText> |  | ||||||
|                     <Parameters> |                     <Parameters> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="tag" ColumnName="tag" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                     </Parameters> |                     </Parameters> | ||||||
|                   </DbCommand> |                   </DbCommand> | ||||||
|                 </InsertCommand> |                 </InsertCommand> | ||||||
|                 <SelectCommand> |                 <SelectCommand> | ||||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> |                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||||
|                     <CommandText>SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,  |                     <CommandText>SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,  | ||||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue |                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput | ||||||
| FROM     JobReport | FROM     JobReport | ||||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | ||||||
| ORDER BY pdate DESC</CommandText> | ORDER BY pdate DESC</CommandText> | ||||||
| @@ -848,32 +858,70 @@ ORDER BY pdate DESC</CommandText> | |||||||
|                 </SelectCommand> |                 </SelectCommand> | ||||||
|                 <UpdateCommand> |                 <UpdateCommand> | ||||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> |                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||||
|                     <CommandText>UPDATE JobReport |                     <CommandText>UPDATE [JobReport] SET [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [process] = @process, [gcode] = @gcode, [description2] = @description2, [tag] = @tag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput WHERE (([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ([gcode] = @Original_gcode) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput))); | ||||||
| SET        pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, remark = @remark, hrs = @hrs,  | SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC</CommandText> | ||||||
|                import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag |  | ||||||
| WHERE  (idx = @Original_idx);    |  | ||||||
| SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC</CommandText> |  | ||||||
|                     <Parameters> |                     <Parameters> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="tag" ColumnName="tag" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_requestpart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_package" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_hrs" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tag" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otStart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otEnd" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_autoinput" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="true" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Original" /> | ||||||
|  |                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                     </Parameters> |                     </Parameters> | ||||||
|                   </DbCommand> |                   </DbCommand> | ||||||
|                 </UpdateCommand> |                 </UpdateCommand> | ||||||
| @@ -903,6 +951,9 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r | |||||||
|               <Mapping SourceColumn="description2" DataSetColumn="description2" /> |               <Mapping SourceColumn="description2" DataSetColumn="description2" /> | ||||||
|               <Mapping SourceColumn="tag" DataSetColumn="tag" /> |               <Mapping SourceColumn="tag" DataSetColumn="tag" /> | ||||||
|               <Mapping SourceColumn="svalue" DataSetColumn="svalue" /> |               <Mapping SourceColumn="svalue" DataSetColumn="svalue" /> | ||||||
|  |               <Mapping SourceColumn="otStart" DataSetColumn="otStart" /> | ||||||
|  |               <Mapping SourceColumn="otEnd" DataSetColumn="otEnd" /> | ||||||
|  |               <Mapping SourceColumn="autoinput" DataSetColumn="autoinput" /> | ||||||
|             </Mappings> |             </Mappings> | ||||||
|             <Sources> |             <Sources> | ||||||
|               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport"> |               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport"> | ||||||
| @@ -945,11 +996,7 @@ WHERE  (pdate BETWEEN @sd AND @ed) AND  (ISNULL(import, 0) = 1) AND (gcode = @gc | |||||||
|               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTagOnly" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTagOnly" GeneratorSourceName="FillByTagOnly" GetMethodModifier="Public" GetMethodName="GetByTagOnly" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTagOnly" UserSourceName="FillByTagOnly"> |               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByTagOnly" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByTagOnly" GeneratorSourceName="FillByTagOnly" GetMethodModifier="Public" GetMethodName="GetByTagOnly" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByTagOnly" UserSourceName="FillByTagOnly"> | ||||||
|                 <SelectCommand> |                 <SelectCommand> | ||||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> |                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||||
|                     <CommandText>SELECT  idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww,  |                     <CommandText>SELECT autoinput, description, description2, gcode, hrs, idx, import, ot, otEnd, otStart, package, pdate, pidx, process, projectName, remark, requestpart, status, dbo.getCodeSValue(gcode, '15', type) AS svalue, tag, type, uid, dbo.getUserName(uid) AS username, wdate, wuid, dbo.getWorkWeek(pdate) AS ww FROM JobReport WHERE (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') ORDER BY pdate DESC</CommandText> | ||||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue |  | ||||||
| FROM     JobReport |  | ||||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') |  | ||||||
| ORDER BY pdate DESC</CommandText> |  | ||||||
|                     <Parameters> |                     <Parameters> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> |                       <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||||
| @@ -2777,7 +2824,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|   <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ"> |   <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ"> | ||||||
|     <xs:complexType> |     <xs:complexType> | ||||||
|       <xs:choice minOccurs="0" maxOccurs="unbounded"> |       <xs:choice minOccurs="0" maxOccurs="unbounded"> | ||||||
|         <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow"> |         <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3044,7 +3091,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_RowClassName="ProjectsIOMapRow"> |         <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3088,7 +3135,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_RowClassName="ProjectsMailListRow"> |         <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3133,7 +3180,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_RowClassName="ProjectsPartRow"> |         <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3249,7 +3296,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow"> |         <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3378,10 +3425,13 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|                   </xs:restriction> |                   </xs:restriction> | ||||||
|                 </xs:simpleType> |                 </xs:simpleType> | ||||||
|               </xs:element> |               </xs:element> | ||||||
|  |               <xs:element name="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" /> | ||||||
|  |               <xs:element name="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" /> | ||||||
|  |               <xs:element name="autoinput" msprop:Generator_ColumnVarNameInTable="columnautoinput" msprop:Generator_ColumnPropNameInRow="autoinput" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="autoinputColumn" msprop:Generator_UserColumnName="autoinput" type="xs:boolean" minOccurs="0" /> | ||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_RowClassName="ProjectsHistoryRow"> |         <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3419,7 +3469,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow"> |         <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" /> |               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" /> | ||||||
| @@ -3535,7 +3585,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_RowClassName="EETGW_NoteRow" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent"> |         <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent" msprop:Generator_RowClassName="EETGW_NoteRow"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3586,7 +3636,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_RowEvArgName="SCTableRowChangeEvent" msprop:Generator_RowClassName="SCTableRow"> |         <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_RowClassName="SCTableRow" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowEvArgName="SCTableRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3599,7 +3649,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent" msprop:Generator_RowClassName="EETGW_SaveCostRow"> |         <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_RowClassName="EETGW_SaveCostRow" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3771,7 +3821,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_RowClassName="ProjectPartStatusRow" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent"> |         <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent" msprop:Generator_RowClassName="ProjectPartStatusRow"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode"> |               <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode"> | ||||||
| @@ -3948,7 +3998,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent"> |         <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -3993,7 +4043,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectToDoRow"> |         <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectToDoRow" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -4070,7 +4120,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent"> |         <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -4261,7 +4311,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent"> |         <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -4400,7 +4450,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow"> |         <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
| @@ -4452,7 +4502,7 @@ WHERE  (idx = @idx)</CommandText> | |||||||
|             </xs:sequence> |             </xs:sequence> | ||||||
|           </xs:complexType> |           </xs:complexType> | ||||||
|         </xs:element> |         </xs:element> | ||||||
|         <xs:element name="EETGW_ProjectReson" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectReson" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectResonRow"> |         <xs:element name="EETGW_ProjectReson" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectResonRow" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent"> | ||||||
|           <xs:complexType> |           <xs:complexType> | ||||||
|             <xs:sequence> |             <xs:sequence> | ||||||
|               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> |               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|      Changes to this file may cause incorrect behavior and will be lost if |      Changes to this file may cause incorrect behavior and will be lost if | ||||||
|      the code is regenerated. |      the code is regenerated. | ||||||
| </autogenerated>--> | </autogenerated>--> | ||||||
| <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="300" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> | <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="126" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> | ||||||
|   <Shapes> |   <Shapes> | ||||||
|     <Shape ID="DesignTable:Projects" ZOrder="7" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> |     <Shape ID="DesignTable:Projects" ZOrder="7" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> | ||||||
|     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="6" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" /> |     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="6" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" /> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 chi
					chi