...

2022-01-11 21:03:01 +09:00
parent 0c1f767c8d
commit bf9fd477c5
9 changed files with 375 additions and 249 deletions
--- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
@@ -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;
    }
 }