...
This commit is contained in:
		
							
								
								
									
										308
									
								
								SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										308
									
								
								SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -30,17 +30,16 @@ | ||||
|         { | ||||
|             this.components = new System.ComponentModel.Container(); | ||||
|             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm)); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); | ||||
|             this.bn = new System.Windows.Forms.BindingNavigator(this.components); | ||||
|             this.bs = new System.Windows.Forms.BindingSource(this.components); | ||||
|             this.dsMSSQL = new FPJ0000.dsPRJ(); | ||||
|             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); | ||||
|             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); | ||||
|             this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); | ||||
| @@ -57,8 +56,6 @@ | ||||
|             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); | ||||
|             this.btEdit = new System.Windows.Forms.ToolStripButton(); | ||||
|             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); | ||||
|             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); | ||||
|             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); | ||||
|             this.toolStrip1 = new System.Windows.Forms.ToolStrip(); | ||||
|             this.lbStt = new System.Windows.Forms.ToolStripLabel(); | ||||
|             this.dtSD = new System.Windows.Forms.ToolStripTextBox(); | ||||
| @@ -70,6 +67,7 @@ | ||||
|             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); | ||||
|             this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); | ||||
|             this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); | ||||
|             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); | ||||
|             this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); | ||||
|             this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); | ||||
|             this.btSearch = new System.Windows.Forms.ToolStripSplitButton(); | ||||
| @@ -77,31 +75,36 @@ | ||||
|             this.richTextBox1 = new System.Windows.Forms.RichTextBox(); | ||||
|             this.splitContainer1 = new System.Windows.Forms.SplitContainer(); | ||||
|             this.dv1 = new arCtl.arDatagridView(); | ||||
|             this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.bs = new System.Windows.Forms.BindingSource(this.components); | ||||
|             this.dsMSSQL = new FPJ0000.dsPRJ(); | ||||
|             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); | ||||
|             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); | ||||
|             this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.WeekName = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.FreeDay = new System.Windows.Forms.DataGridViewCheckBoxColumn(); | ||||
|             this.usernameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.requestpartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.packageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); | ||||
|             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); | ||||
|             this.bn.SuspendLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); | ||||
|             this.toolStrip1.SuspendLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); | ||||
|             this.splitContainer1.Panel1.SuspendLayout(); | ||||
|             this.splitContainer1.Panel2.SuspendLayout(); | ||||
|             this.splitContainer1.SuspendLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); | ||||
|             this.SuspendLayout(); | ||||
|             //  | ||||
|             // bn | ||||
| @@ -139,17 +142,6 @@ | ||||
|             this.bn.TabIndex = 0; | ||||
|             this.bn.Text = "bindingNavigator1"; | ||||
|             //  | ||||
|             // bs | ||||
|             //  | ||||
|             this.bs.DataMember = "JobReport"; | ||||
|             this.bs.DataSource = this.dsMSSQL; | ||||
|             this.bs.Sort = "pdate desc"; | ||||
|             //  | ||||
|             // dsMSSQL | ||||
|             //  | ||||
|             this.dsMSSQL.DataSetName = "dsMSSQL"; | ||||
|             this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; | ||||
|             //  | ||||
|             // bindingNavigatorCountItem | ||||
|             //  | ||||
|             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; | ||||
| @@ -275,31 +267,6 @@ | ||||
|             this.toolStripButton1.Text = "일괄승인"; | ||||
|             this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); | ||||
|             //  | ||||
|             // tam | ||||
|             //  | ||||
|             this.tam.BackupDataSetBeforeUpdate = false; | ||||
|             this.tam.EETGW_JobReport_AutoInputTableAdapter = null; | ||||
|             this.tam.EETGW_JobReport_EBoardTableAdapter = null; | ||||
|             this.tam.EETGW_NoteTableAdapter = null; | ||||
|             this.tam.EETGW_ProjecthistoryDTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectResonTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectsScheduleTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectToDoTableAdapter = null; | ||||
|             this.tam.EETGW_SaveCostTableAdapter = null; | ||||
|             this.tam.JobReportTableAdapter = this.ta; | ||||
|             this.tam.ProjectPartStatusTableAdapter = null; | ||||
|             this.tam.ProjectsHistoryTableAdapter = null; | ||||
|             this.tam.ProjectsIOMapTableAdapter = null; | ||||
|             this.tam.ProjectsMailListTableAdapter = null; | ||||
|             this.tam.ProjectsPartTableAdapter = null; | ||||
|             this.tam.ProjectsTableAdapter = null; | ||||
|             this.tam.SPMasterTableAdapter = null; | ||||
|             this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; | ||||
|             //  | ||||
|             // ta | ||||
|             //  | ||||
|             this.ta.ClearBeforeFill = true; | ||||
|             //  | ||||
|             // toolStrip1 | ||||
|             //  | ||||
|             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); | ||||
| @@ -385,7 +352,6 @@ | ||||
|             // tbProcess | ||||
|             //  | ||||
|             this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); | ||||
|             this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F); | ||||
|             this.tbProcess.Name = "tbProcess"; | ||||
|             this.tbProcess.Size = new System.Drawing.Size(300, 37); | ||||
|             //  | ||||
| @@ -399,6 +365,11 @@ | ||||
|             this.toolStripButton4.Text = "toolStripButton4"; | ||||
|             this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); | ||||
|             //  | ||||
|             // toolStripSeparator3 | ||||
|             //  | ||||
|             this.toolStripSeparator3.Name = "toolStripSeparator3"; | ||||
|             this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); | ||||
|             //  | ||||
|             // toolStripLabel3 | ||||
|             //  | ||||
|             this.toolStripLabel3.Name = "toolStripLabel3"; | ||||
| @@ -479,19 +450,21 @@ | ||||
|             this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; | ||||
|             this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; | ||||
|             this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { | ||||
|             this.pdateDataGridViewTextBoxColumn, | ||||
|             this.wwDataGridViewTextBoxColumn, | ||||
|             this.pdateDataGridViewTextBoxColumn, | ||||
|             this.WeekName, | ||||
|             this.FreeDay, | ||||
|             this.usernameDataGridViewTextBoxColumn, | ||||
|             this.requestpartDataGridViewTextBoxColumn, | ||||
|             this.packageDataGridViewTextBoxColumn, | ||||
|             this.statusDataGridViewTextBoxColumn, | ||||
|             this.svalueDataGridViewTextBoxColumn, | ||||
|             this.projectNameDataGridViewTextBoxColumn, | ||||
|             this.otDataGridViewTextBoxColumn, | ||||
|             this.ot2DataGridViewTextBoxColumn, | ||||
|             this.otReasonDataGridViewTextBoxColumn, | ||||
|             this.otStartDataGridViewTextBoxColumn, | ||||
|             this.otEnd, | ||||
|             this.projectNameDataGridViewTextBoxColumn, | ||||
|             this.descriptionDataGridViewTextBoxColumn}); | ||||
|             this.dv1.DataSource = this.bs; | ||||
|             this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; | ||||
| @@ -502,34 +475,88 @@ | ||||
|             this.dv1.TabIndex = 3; | ||||
|             this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); | ||||
|             //  | ||||
|             // pdateDataGridViewTextBoxColumn | ||||
|             // bs | ||||
|             //  | ||||
|             this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; | ||||
|             dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle41; | ||||
|             this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; | ||||
|             this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; | ||||
|             this.pdateDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.pdateDataGridViewTextBoxColumn.Width = 51; | ||||
|             this.bs.DataMember = "JobReport"; | ||||
|             this.bs.DataSource = this.dsMSSQL; | ||||
|             this.bs.Sort = "pdate desc"; | ||||
|             //  | ||||
|             // dsMSSQL | ||||
|             //  | ||||
|             this.dsMSSQL.DataSetName = "dsMSSQL"; | ||||
|             this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; | ||||
|             //  | ||||
|             // tam | ||||
|             //  | ||||
|             this.tam.BackupDataSetBeforeUpdate = false; | ||||
|             this.tam.EETGW_JobReport_AutoInputTableAdapter = null; | ||||
|             this.tam.EETGW_JobReport_EBoardTableAdapter = null; | ||||
|             this.tam.EETGW_NoteTableAdapter = null; | ||||
|             this.tam.EETGW_ProjecthistoryDTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectResonTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectsScheduleTableAdapter = null; | ||||
|             this.tam.EETGW_ProjectToDoTableAdapter = null; | ||||
|             this.tam.EETGW_SaveCostTableAdapter = null; | ||||
|             this.tam.JobReportTableAdapter = this.ta; | ||||
|             this.tam.ProjectPartStatusTableAdapter = null; | ||||
|             this.tam.ProjectsHistoryTableAdapter = null; | ||||
|             this.tam.ProjectsIOMapTableAdapter = null; | ||||
|             this.tam.ProjectsMailListTableAdapter = null; | ||||
|             this.tam.ProjectsPartTableAdapter = null; | ||||
|             this.tam.ProjectsTableAdapter = null; | ||||
|             this.tam.SPMasterTableAdapter = null; | ||||
|             this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; | ||||
|             //  | ||||
|             // ta | ||||
|             //  | ||||
|             this.ta.ClearBeforeFill = true; | ||||
|             //  | ||||
|             // wwDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; | ||||
|             dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||
|             this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle42; | ||||
|             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||
|             this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; | ||||
|             this.wwDataGridViewTextBoxColumn.HeaderText = "WW"; | ||||
|             this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; | ||||
|             this.wwDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.wwDataGridViewTextBoxColumn.Width = 50; | ||||
|             //  | ||||
|             // pdateDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; | ||||
|             dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; | ||||
|             this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; | ||||
|             this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; | ||||
|             this.pdateDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.pdateDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // WeekName | ||||
|             //  | ||||
|             this.WeekName.DataPropertyName = "WeekName"; | ||||
|             dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             this.WeekName.DefaultCellStyle = dataGridViewCellStyle3; | ||||
|             this.WeekName.HeaderText = "*"; | ||||
|             this.WeekName.Name = "WeekName"; | ||||
|             this.WeekName.ReadOnly = true; | ||||
|             this.WeekName.Width = 36; | ||||
|             //  | ||||
|             // FreeDay | ||||
|             //  | ||||
|             this.FreeDay.DataPropertyName = "FreeDay"; | ||||
|             this.FreeDay.HeaderText = "휴일"; | ||||
|             this.FreeDay.Name = "FreeDay"; | ||||
|             this.FreeDay.ReadOnly = true; | ||||
|             this.FreeDay.Width = 35; | ||||
|             //  | ||||
|             // usernameDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; | ||||
|             this.usernameDataGridViewTextBoxColumn.HeaderText = "담당"; | ||||
|             this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; | ||||
|             this.usernameDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.usernameDataGridViewTextBoxColumn.Width = 51; | ||||
|             this.usernameDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // requestpartDataGridViewTextBoxColumn | ||||
|             //  | ||||
| @@ -537,7 +564,7 @@ | ||||
|             this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; | ||||
|             this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; | ||||
|             this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.requestpartDataGridViewTextBoxColumn.Width = 61; | ||||
|             this.requestpartDataGridViewTextBoxColumn.Width = 78; | ||||
|             //  | ||||
|             // packageDataGridViewTextBoxColumn | ||||
|             //  | ||||
| @@ -545,17 +572,17 @@ | ||||
|             this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; | ||||
|             this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; | ||||
|             this.packageDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.packageDataGridViewTextBoxColumn.Width = 61; | ||||
|             this.packageDataGridViewTextBoxColumn.Width = 66; | ||||
|             //  | ||||
|             // statusDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; | ||||
|             dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle43; | ||||
|             dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; | ||||
|             this.statusDataGridViewTextBoxColumn.HeaderText = "상태"; | ||||
|             this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; | ||||
|             this.statusDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.statusDataGridViewTextBoxColumn.Width = 51; | ||||
|             this.statusDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // svalueDataGridViewTextBoxColumn | ||||
|             //  | ||||
| @@ -563,7 +590,66 @@ | ||||
|             this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; | ||||
|             this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; | ||||
|             this.svalueDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.svalueDataGridViewTextBoxColumn.Width = 61; | ||||
|             this.svalueDataGridViewTextBoxColumn.Width = 78; | ||||
|             //  | ||||
|             // otDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; | ||||
|             dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; | ||||
|             dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Red; | ||||
|             dataGridViewCellStyle5.Format = "N1"; | ||||
|             this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; | ||||
|             this.otDataGridViewTextBoxColumn.HeaderText = "초과"; | ||||
|             this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; | ||||
|             this.otDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.otDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // ot2DataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; | ||||
|             dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); | ||||
|             dataGridViewCellStyle6.Format = "N1"; | ||||
|             this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; | ||||
|             this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; | ||||
|             this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; | ||||
|             this.ot2DataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // otReasonDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; | ||||
|             dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); | ||||
|             this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; | ||||
|             this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; | ||||
|             this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; | ||||
|             this.otReasonDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // otStartDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; | ||||
|             dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle8.Format = "HH:mm:ss"; | ||||
|             this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; | ||||
|             this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; | ||||
|             this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; | ||||
|             this.otStartDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.otStartDataGridViewTextBoxColumn.Visible = false; | ||||
|             this.otStartDataGridViewTextBoxColumn.Width = 54; | ||||
|             //  | ||||
|             // otEnd | ||||
|             //  | ||||
|             this.otEnd.DataPropertyName = "otEnd"; | ||||
|             dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle9.Format = "HH:mm:ss"; | ||||
|             this.otEnd.DefaultCellStyle = dataGridViewCellStyle9; | ||||
|             this.otEnd.HeaderText = "종료"; | ||||
|             this.otEnd.Name = "otEnd"; | ||||
|             this.otEnd.ReadOnly = true; | ||||
|             this.otEnd.Visible = false; | ||||
|             this.otEnd.Width = 54; | ||||
|             //  | ||||
|             // projectNameDataGridViewTextBoxColumn | ||||
|             //  | ||||
| @@ -573,63 +659,6 @@ | ||||
|             this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.projectNameDataGridViewTextBoxColumn.Width = 87; | ||||
|             //  | ||||
|             // otDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; | ||||
|             dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; | ||||
|             dataGridViewCellStyle44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Red; | ||||
|             dataGridViewCellStyle44.Format = "N1"; | ||||
|             this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle44; | ||||
|             this.otDataGridViewTextBoxColumn.HeaderText = "초과"; | ||||
|             this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; | ||||
|             this.otDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.otDataGridViewTextBoxColumn.Width = 51; | ||||
|             //  | ||||
|             // ot2DataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; | ||||
|             dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); | ||||
|             dataGridViewCellStyle45.Format = "N1"; | ||||
|             this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle45; | ||||
|             this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; | ||||
|             this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; | ||||
|             this.ot2DataGridViewTextBoxColumn.Width = 51; | ||||
|             //  | ||||
|             // otReasonDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; | ||||
|             dataGridViewCellStyle46.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); | ||||
|             this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle46; | ||||
|             this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; | ||||
|             this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; | ||||
|             this.otReasonDataGridViewTextBoxColumn.Width = 51; | ||||
|             //  | ||||
|             // otStartDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; | ||||
|             dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle47.Format = "HH:mm:ss"; | ||||
|             this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle47; | ||||
|             this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; | ||||
|             this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; | ||||
|             this.otStartDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.otStartDataGridViewTextBoxColumn.Width = 51; | ||||
|             //  | ||||
|             // otEnd | ||||
|             //  | ||||
|             this.otEnd.DataPropertyName = "otEnd"; | ||||
|             dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; | ||||
|             dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); | ||||
|             dataGridViewCellStyle48.Format = "HH:mm:ss"; | ||||
|             this.otEnd.DefaultCellStyle = dataGridViewCellStyle48; | ||||
|             this.otEnd.HeaderText = "종료"; | ||||
|             this.otEnd.Name = "otEnd"; | ||||
|             this.otEnd.ReadOnly = true; | ||||
|             this.otEnd.Width = 51; | ||||
|             //  | ||||
|             // descriptionDataGridViewTextBoxColumn | ||||
|             //  | ||||
|             this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; | ||||
| @@ -638,11 +667,6 @@ | ||||
|             this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; | ||||
|             this.descriptionDataGridViewTextBoxColumn.Width = 51; | ||||
|             //  | ||||
|             // toolStripSeparator3 | ||||
|             //  | ||||
|             this.toolStripSeparator3.Name = "toolStripSeparator3"; | ||||
|             this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); | ||||
|             //  | ||||
|             // fOTConfirm | ||||
|             //  | ||||
|             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); | ||||
| @@ -658,8 +682,6 @@ | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); | ||||
|             this.bn.ResumeLayout(false); | ||||
|             this.bn.PerformLayout(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); | ||||
|             this.toolStrip1.ResumeLayout(false); | ||||
|             this.toolStrip1.PerformLayout(); | ||||
|             this.splitContainer1.Panel1.ResumeLayout(false); | ||||
| @@ -667,6 +689,8 @@ | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); | ||||
|             this.splitContainer1.ResumeLayout(false); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); | ||||
|             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); | ||||
|             this.ResumeLayout(false); | ||||
|             this.PerformLayout(); | ||||
|  | ||||
| @@ -713,20 +737,22 @@ | ||||
|         private arCtl.arDatagridView dv1; | ||||
|         private System.Windows.Forms.ToolStripButton btEdit; | ||||
|         private System.Windows.Forms.ToolStripButton toolStripButton1; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn WeekName; | ||||
|         private System.Windows.Forms.DataGridViewCheckBoxColumn FreeDay; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn usernameDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn requestpartDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn packageDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn statusDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn ot2DataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn otReasonDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn otEnd; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; | ||||
|         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; | ||||
|     } | ||||
| } | ||||
| @@ -71,7 +71,7 @@ namespace FPJ0000 | ||||
|                 cmbUser.Text = namestr; | ||||
|                 dv1.EditMode = DataGridViewEditMode.EditProgrammatically; | ||||
|             } | ||||
|              | ||||
|  | ||||
|  | ||||
|             if (cmbUser.SelectedIndex < 0) | ||||
|             { | ||||
| @@ -99,7 +99,7 @@ namespace FPJ0000 | ||||
|  | ||||
|  | ||||
|             //일반사용자의경우에는 상태를 변경하지 못한다. | ||||
|        | ||||
|  | ||||
|             if (curLevel >= 5) | ||||
|             { | ||||
|  | ||||
| @@ -247,7 +247,7 @@ namespace FPJ0000 | ||||
|  | ||||
|  | ||||
|             //사용자 목록다중선택으로 인해 처리 | ||||
|             var sql = "SELECT *, dbo.getUserName(uid) AS username,  dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue"; | ||||
|             var sql = "SELECT *, dbo.getUserName(uid) AS username,  dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue, dbo.IsHoliday(pdate) as FreeDay,dbo.[GetWeekName](pdate) as WeekName"; | ||||
|             sql += " FROM JobReport"; | ||||
|             sql += " WHERE (pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)"; | ||||
|             sql += " and isnull(ot,0) > 0"; | ||||
| @@ -488,13 +488,17 @@ namespace FPJ0000 | ||||
|         private void toolStripButton1_Click(object sender, EventArgs e) | ||||
|         { | ||||
|             //전체승인 | ||||
|             var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?"); | ||||
|             var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다"); | ||||
|             if (dlg != DialogResult.Yes) return; | ||||
|  | ||||
|             foreach (dsPRJ.JobReportRow dr in this.dsMSSQL.JobReport) | ||||
|             { | ||||
|                 if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue; | ||||
|                 if(dr.ot2 == 0) dr.ot2 = dr.ot; | ||||
|                 if (dr.ot2 == 0) | ||||
|                 { | ||||
|                     if (dr.FreeDay) dr.ot2 = dr.ot * 1.5; | ||||
|                     else dr.ot2 = dr.ot; | ||||
|                 } | ||||
|                 dr.EndEdit(); | ||||
|             } | ||||
|  | ||||
|   | ||||
| @@ -181,20 +181,20 @@ | ||||
|   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||||
|     <value> | ||||
|         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 | ||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s | ||||
|         Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn | ||||
|         fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl | ||||
|         Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy | ||||
|         QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB | ||||
|         xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb | ||||
|         x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk | ||||
|         fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd | ||||
|         iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB | ||||
|         Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox | ||||
|         BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC | ||||
|         pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn | ||||
|         D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8 | ||||
|         AcSjn/E9z3PXAAAAAElFTkSuQmCC | ||||
|         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSapFRL0pTmxrY | ||||
|         zVTMvM0pmprowiBbTCPzEpqoUCFK0YsK7aJTm5rbnG44S3OZlznvgpel7nKO7pz57TlnSw2EfvDhefGc | ||||
|         74fz+54j4Cbovir+UolOGV6q+x0s01HkpHnKuFNPh5f00qFPtMazUk3FkYi3+/jQ7gl51K1ZstIrxhET | ||||
|         a7FvwGLbYcXKQePXghX5n2YQXTriEGUo9nui7gkr0i4Nj5nZ3ikn9NMM9DMMdFMMtJObUI1voHXYjg0G | ||||
|         aBqhkP9hGknPjNQ/kmBZK7Xu2ET/LItvsww5GfTxkk2oTRv4MuwgAhf6F1jo550oVMwg4F7nGz4cVeZv | ||||
|         viGL2JJUX0NS1XVUtdWjoKEMATIf+BNEhWcQJD+F8qZyfhUbzWBx1YGgRDXDCyJLAt53DjWjeewlqnS5 | ||||
|         vCSuMhS5r2ORWR8Ncc1lJNYkomlwEc1GGz7/WMca6SlY3k3zAlGFaL+fLIvVjXbh1ZAcxaoMXhJfHUbC | ||||
|         V5D6PAUak51fpWOMgpL0sGp3Irigxy3gJqRITWfXJsBg0qJGfxeP23MQVXYB8ZURMEw5YCDFcgVrJtyd | ||||
|         WIggSL5LcO6BzOmXdxixFSL0T/SisCsNckU2op8Gol71EQNzDAyk2N5JJ3oIS1YnAh56BCekXhKh9BAy | ||||
|         62JwszoEMeUXeUm2IhbShhTyJoHg7vtnWPRxn5hgJUX6ZmndAqH0wJxQepA85AVhrheuFgci/UUCNMNK | ||||
|         FCrzkPYuAeLqSBiIQE/+DR0R0E4XEah2Vjif1U0vrNEYnGN51KPzuFObimQSlNREI6fu9vYdh2OTJYLG | ||||
|         HQFnm7XsCP6HnVshZZfgdPZXh+b76NZeD++FaXLadSyuyeaJkyJT283T6w6rZmDcZV6mYF6iYPKwbHPy | ||||
|         cM3baBYjpikXRVFr3rdafnriAsHJ1LZ0X3Fr+3GJ0uIraaS3SXbj8xdxI+0tblk9mtjS4ZOgSBIIBII/ | ||||
|         aFuft/aGoE8AAAAASUVORK5CYII= | ||||
| </value> | ||||
|   </data> | ||||
|   <data name="btEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> | ||||
| @@ -223,15 +223,6 @@ | ||||
|         TgDQASA1MVpwzwAAAABJRU5ErkJggg== | ||||
| </value> | ||||
|   </data> | ||||
|   <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>17, 17</value> | ||||
|   </metadata> | ||||
|   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>186, 17</value> | ||||
|   </metadata> | ||||
|   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>499, 17</value> | ||||
|   </metadata> | ||||
|   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>393, 17</value> | ||||
|   </metadata> | ||||
| @@ -269,10 +260,19 @@ | ||||
|         UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC | ||||
| </value> | ||||
|   </data> | ||||
|   <metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | ||||
|   <metadata name="WeekName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | ||||
|     <value>True</value> | ||||
|   </metadata> | ||||
|   <metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | ||||
|     <value>True</value> | ||||
|   </metadata> | ||||
|   <metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> | ||||
|     <value>True</value> | ||||
|   </metadata> | ||||
|   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>186, 17</value> | ||||
|   </metadata> | ||||
|   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||
|     <value>499, 17</value> | ||||
|   </metadata> | ||||
| </root> | ||||
							
								
								
									
										104
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										104
									
								
								SubProject/FPJ0000/dsPRJ.Designer.cs
									
									
									
										generated
									
									
									
								
							| @@ -3627,6 +3627,10 @@ namespace FPJ0000 { | ||||
|              | ||||
|             private global::System.Data.DataColumn columnotReason; | ||||
|              | ||||
|             private global::System.Data.DataColumn columnFreeDay; | ||||
|              | ||||
|             private global::System.Data.DataColumn columnWeekName; | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public JobReportDataTable() { | ||||
| @@ -3916,6 +3920,22 @@ namespace FPJ0000 { | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public global::System.Data.DataColumn FreeDayColumn { | ||||
|                 get { | ||||
|                     return this.columnFreeDay; | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public global::System.Data.DataColumn WeekNameColumn { | ||||
|                 get { | ||||
|                     return this.columnWeekName; | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             [global::System.ComponentModel.Browsable(false)] | ||||
| @@ -3984,7 +4004,9 @@ namespace FPJ0000 { | ||||
|                         string kisuldiv,  | ||||
|                         decimal kisulamt,  | ||||
|                         double ot2,  | ||||
|                         string otReason) { | ||||
|                         string otReason,  | ||||
|                         bool FreeDay,  | ||||
|                         string WeekName) { | ||||
|                 JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow())); | ||||
|                 object[] columnValuesArray = new object[] { | ||||
|                         null, | ||||
| @@ -4018,7 +4040,9 @@ namespace FPJ0000 { | ||||
|                         kisuldiv, | ||||
|                         kisulamt, | ||||
|                         ot2, | ||||
|                         otReason}; | ||||
|                         otReason, | ||||
|                         FreeDay, | ||||
|                         WeekName}; | ||||
|                 rowJobReportRow.ItemArray = columnValuesArray; | ||||
|                 this.Rows.Add(rowJobReportRow); | ||||
|                 return rowJobReportRow; | ||||
| @@ -4080,6 +4104,8 @@ namespace FPJ0000 { | ||||
|                 this.columnkisulamt = base.Columns["kisulamt"]; | ||||
|                 this.columnot2 = base.Columns["ot2"]; | ||||
|                 this.columnotReason = base.Columns["otReason"]; | ||||
|                 this.columnFreeDay = base.Columns["FreeDay"]; | ||||
|                 this.columnWeekName = base.Columns["WeekName"]; | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
| @@ -4149,6 +4175,10 @@ namespace FPJ0000 { | ||||
|                 base.Columns.Add(this.columnot2); | ||||
|                 this.columnotReason = new global::System.Data.DataColumn("otReason", typeof(string), null, global::System.Data.MappingType.Element); | ||||
|                 base.Columns.Add(this.columnotReason); | ||||
|                 this.columnFreeDay = new global::System.Data.DataColumn("FreeDay", typeof(bool), null, global::System.Data.MappingType.Element); | ||||
|                 base.Columns.Add(this.columnFreeDay); | ||||
|                 this.columnWeekName = new global::System.Data.DataColumn("WeekName", typeof(string), null, global::System.Data.MappingType.Element); | ||||
|                 base.Columns.Add(this.columnWeekName); | ||||
|                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { | ||||
|                                 this.columnidx}, true)); | ||||
|                 this.columnidx.AutoIncrement = true; | ||||
| @@ -4183,6 +4213,9 @@ namespace FPJ0000 { | ||||
|                 this.columnkisullv.MaxLength = 10; | ||||
|                 this.columnkisuldiv.MaxLength = 100; | ||||
|                 this.columnotReason.MaxLength = 255; | ||||
|                 this.columnFreeDay.ReadOnly = true; | ||||
|                 this.columnWeekName.ReadOnly = true; | ||||
|                 this.columnWeekName.MaxLength = 10; | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
| @@ -14162,6 +14195,38 @@ namespace FPJ0000 { | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public bool FreeDay { | ||||
|                 get { | ||||
|                     if (this.IsFreeDayNull()) { | ||||
|                         return false; | ||||
|                     } | ||||
|                     else { | ||||
|                         return ((bool)(this[this.tableJobReport.FreeDayColumn])); | ||||
|                     } | ||||
|                 } | ||||
|                 set { | ||||
|                     this[this.tableJobReport.FreeDayColumn] = value; | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public string WeekName { | ||||
|                 get { | ||||
|                     if (this.IsWeekNameNull()) { | ||||
|                         return string.Empty; | ||||
|                     } | ||||
|                     else { | ||||
|                         return ((string)(this[this.tableJobReport.WeekNameColumn])); | ||||
|                     } | ||||
|                 } | ||||
|                 set { | ||||
|                     this[this.tableJobReport.WeekNameColumn] = value; | ||||
|                 } | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public bool IspdateNull() { | ||||
| @@ -14497,6 +14562,30 @@ namespace FPJ0000 { | ||||
|             public void SetotReasonNull() { | ||||
|                 this[this.tableJobReport.otReasonColumn] = global::System.Convert.DBNull; | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public bool IsFreeDayNull() { | ||||
|                 return this.IsNull(this.tableJobReport.FreeDayColumn); | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public void SetFreeDayNull() { | ||||
|                 this[this.tableJobReport.FreeDayColumn] = global::System.Convert.DBNull; | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public bool IsWeekNameNull() { | ||||
|                 return this.IsNull(this.tableJobReport.WeekNameColumn); | ||||
|             } | ||||
|              | ||||
|             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
|             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] | ||||
|             public void SetWeekNameNull() { | ||||
|                 this[this.tableJobReport.WeekNameColumn] = global::System.Convert.DBNull; | ||||
|             } | ||||
|         } | ||||
|          | ||||
|         /// <summary> | ||||
| @@ -25248,6 +25337,8 @@ ORDER BY Project, no, ItemGroup, option1, ItemName"; | ||||
|             tableMapping.ColumnMappings.Add("kisulamt", "kisulamt"); | ||||
|             tableMapping.ColumnMappings.Add("ot2", "ot2"); | ||||
|             tableMapping.ColumnMappings.Add("otReason", "otReason"); | ||||
|             tableMapping.ColumnMappings.Add("FreeDay", "FreeDay"); | ||||
|             tableMapping.ColumnMappings.Add("WeekName", "WeekName"); | ||||
|             this._adapter.TableMappings.Add(tableMapping); | ||||
|             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             this._adapter.DeleteCommand.Connection = this.Connection; | ||||
| @@ -25343,7 +25434,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r | ||||
|             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             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, 
 | ||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason | ||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay,  | ||||
|                dbo.GetWeekName(pdate) AS WeekName | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | ||||
| ORDER BY pdate DESC";
 | ||||
| @@ -25378,11 +25470,7 @@ ORDER BY pdate DESC"; | ||||
|             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); | ||||
|             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); | ||||
|             this._commandCollection[4].Connection = this.Connection; | ||||
|             this._commandCollection[4].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, kisullv, kisuldiv, kisulamt, ot2, otReason | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') | ||||
| ORDER BY pdate DESC";
 | ||||
|             this._commandCollection[4].CommandText = @"SELECT autoinput, description, description2, gcode, hrs, idx, import, kisulamt, kisuldiv, kisullv, ot, ot2, otEnd, otReason, 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"; | ||||
|             this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; | ||||
|             this._commandCollection[4].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[4].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, "", "", "")); | ||||
|   | ||||
| @@ -776,56 +776,57 @@ WHERE  (Project = @pidx)</CommandText> | ||||
|             <MainSource> | ||||
|               <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> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||
|                     <CommandText>DELETE FROM JobReport | ||||
| WHERE  (idx = @Original_idx)</CommandText> | ||||
|                     <Parameters> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" 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="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" /> | ||||
|                     </Parameters> | ||||
|                   </DbCommand> | ||||
|                 </DeleteCommand> | ||||
|                 <InsertCommand> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||
|                     <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, kisullv,  | ||||
|                kisuldiv, kisulamt, ot2, otReason) | ||||
| VALUES  (@pidx,@pdate,@uid,@requestpart,@package,@status,@type,@description,@remark,@hrs,@import,@wuid,@wdate,@projectName,@ot,@process,@gcode,@description2,@tag,@otStart,@otEnd,@autoinput,@kisullv,@kisuldiv,@kisulamt,@ot2,@otReason);   | ||||
| 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> | ||||
|                     <Parameters> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" 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="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" 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="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" 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="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" 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="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" 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="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" 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="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" 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="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" 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="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" 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="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" 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="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" 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="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" 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="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" 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="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" 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="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" 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="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" 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="tag" ColumnName="tag" DataSourceName="EE.dbo.JobReport" 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="otStart" ColumnName="otStart" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="EE.dbo.JobReport" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="otStart" ColumnName="otStart" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                     </Parameters> | ||||
|                   </DbCommand> | ||||
|                 </InsertCommand> | ||||
|                 <SelectCommand> | ||||
|                   <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,  | ||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason | ||||
|                process, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay,  | ||||
|                dbo.GetWeekName(pdate) AS WeekName | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) | ||||
| ORDER BY pdate DESC</CommandText> | ||||
| @@ -838,7 +839,7 @@ ORDER BY pdate DESC</CommandText> | ||||
|                   </DbCommand> | ||||
|                 </SelectCommand> | ||||
|                 <UpdateCommand> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="false"> | ||||
|                     <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,  | ||||
| @@ -846,35 +847,35 @@ SET        pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, | ||||
| 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, gcode, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput FROM JobReport WHERE (idx = @idx) ORDER BY pdate DESC</CommandText> | ||||
|                     <Parameters> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" 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="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" 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="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" 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="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" 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="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" 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="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" 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="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" 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="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" 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="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" 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="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" 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="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" 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="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" 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="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" 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="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" 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="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" 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="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" 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="tag" ColumnName="tag" DataSourceName="EE.dbo.JobReport" 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="otStart" ColumnName="otStart" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="EE.dbo.JobReport" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" 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="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="Original" /> | ||||
|                       <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="otStart" ColumnName="otStart" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" /> | ||||
|                       <Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" 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="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" /> | ||||
|                     </Parameters> | ||||
|                   </DbCommand> | ||||
|                 </UpdateCommand> | ||||
| @@ -912,6 +913,8 @@ SELECT idx, pidx, pdate, uid, requestpart, package, status, type, description, r | ||||
|               <Mapping SourceColumn="kisulamt" DataSetColumn="kisulamt" /> | ||||
|               <Mapping SourceColumn="ot2" DataSetColumn="ot2" /> | ||||
|               <Mapping SourceColumn="otReason" DataSetColumn="otReason" /> | ||||
|               <Mapping SourceColumn="FreeDay" DataSetColumn="FreeDay" /> | ||||
|               <Mapping SourceColumn="WeekName" DataSetColumn="WeekName" /> | ||||
|             </Mappings> | ||||
|             <Sources> | ||||
|               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckOt2Input" Modifier="Public" Name="CheckOt2Input" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckOt2Input"> | ||||
| @@ -967,11 +970,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"> | ||||
|                 <SelectCommand> | ||||
|                   <DbCommand CommandType="Text" ModifiedByUser="true"> | ||||
|                     <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, kisullv, kisuldiv, kisulamt, ot2, otReason | ||||
| FROM     JobReport | ||||
| WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode) AND (ISNULL(tag, '') <> '') | ||||
| ORDER BY pdate DESC</CommandText> | ||||
|                     <CommandText>SELECT autoinput, description, description2, gcode, hrs, idx, import, kisulamt, kisuldiv, kisullv, ot, ot2, otEnd, otReason, 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> | ||||
|                     <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="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" /> | ||||
| @@ -3414,6 +3413,14 @@ WHERE  (idx = @idx)</CommandText> | ||||
|                   </xs:restriction> | ||||
|                 </xs:simpleType> | ||||
|               </xs:element> | ||||
|               <xs:element name="FreeDay" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="FreeDay" msprop:Generator_ColumnVarNameInTable="columnFreeDay" msprop:Generator_ColumnPropNameInTable="FreeDayColumn" msprop:Generator_UserColumnName="FreeDay" type="xs:boolean" minOccurs="0" /> | ||||
|               <xs:element name="WeekName" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnWeekName" msprop:Generator_ColumnPropNameInRow="WeekName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="WeekNameColumn" msprop:Generator_UserColumnName="WeekName" minOccurs="0"> | ||||
|                 <xs:simpleType> | ||||
|                   <xs:restriction base="xs:string"> | ||||
|                     <xs:maxLength value="10" /> | ||||
|                   </xs:restriction> | ||||
|                 </xs:simpleType> | ||||
|               </xs:element> | ||||
|             </xs:sequence> | ||||
|           </xs:complexType> | ||||
|         </xs:element> | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|      Changes to this file may cause incorrect behavior and will be lost if | ||||
|      the code is regenerated. | ||||
| </autogenerated>--> | ||||
| <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" 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="132" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> | ||||
|   <Shapes> | ||||
|     <Shape ID="DesignTable:Projects" ZOrder="4" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> | ||||
|     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="9" 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