diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 7d48bc7..7d49d52 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.02.25.0150")] -[assembly: AssemblyFileVersion("22.02.25.0150")] +[assembly: AssemblyVersion("22.02.25.1925")] +[assembly: AssemblyFileVersion("22.02.25.1925")] diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 80669e2..51dfe3e 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -581,6 +581,36 @@ namespace FCOMMON return retval; } + public static Boolean InsertLog(string cate, string remark, string pdate = "") + { + if (String.IsNullOrEmpty(pdate)) pdate = DateTime.Now.ToShortDateString(); + + try + { + var cn = getCn(); + cn.Open(); + var sql = "insert into EETGW_Log(gcode,pdate,cate,remark,wuid,wdate)" + + " values(@gcode,@pdate,@cate,@remark,@wuid,@wdate)"; + + //sql = string.Format(sql, info.Login.gcode, memo); + var cmd = new SqlCommand(sql, cn); + cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); + cmd.Parameters.Add(new SqlParameter("pdate", pdate)); + cmd.Parameters.Add(new SqlParameter("cate", cate)); + cmd.Parameters.Add(new SqlParameter("remark", remark)); + cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no)); + cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now)); + var da = cmd.ExecuteNonQuery(); + + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return da > 0; + } + + catch {} + return false; + } public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "") diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 74202e1..8fd8cc5 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -253,6 +253,12 @@ fHolyRequest.cs + + Form + + + fOTConfirmOK.cs + Form @@ -580,6 +586,9 @@ fHolyRequest.cs + + fOTConfirmOK.cs + fHolyRequestAdd.cs diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs index 76fe2cc..747bf28 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs @@ -30,16 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm)); - 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = 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(); @@ -54,8 +56,9 @@ this.btFind = new System.Windows.Forms.ToolStripButton(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.btEdit = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btConf = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.btConfAll = new System.Windows.Forms.ToolStripButton(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); @@ -75,10 +78,6 @@ this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.dv1 = new arCtl.arDatagridView(); - 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(); @@ -95,16 +94,18 @@ this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); ((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 @@ -129,8 +130,9 @@ this.btFind, this.toolStripButton5, this.bindingNavigatorSeparator2, - this.btEdit, - this.toolStripButton1}); + this.btConf, + this.toolStripSeparator4, + this.btConfAll}); this.bn.Location = new System.Drawing.Point(0, 730); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -142,6 +144,17 @@ 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"; @@ -176,6 +189,7 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -218,6 +232,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -248,24 +263,28 @@ this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); // - // btEdit + // btConf // - this.btEdit.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image"))); - this.btEdit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btEdit.Name = "btEdit"; - this.btEdit.Size = new System.Drawing.Size(66, 22); - this.btEdit.Text = "저장(&S)"; - this.btEdit.Click += new System.EventHandler(this.btEdit_Click); + this.btConf.Image = ((System.Drawing.Image)(resources.GetObject("btConf.Image"))); + this.btConf.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btConf.Name = "btConf"; + this.btConf.Size = new System.Drawing.Size(51, 22); + this.btConf.Text = "승인"; + this.btConf.Click += new System.EventHandler(this.toolStripButton3_Click); // - // toolStripButton1 + // toolStripSeparator4 // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(75, 22); - this.toolStripButton1.Text = "일괄승인"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // btConfAll + // + this.btConfAll.Image = ((System.Drawing.Image)(resources.GetObject("btConfAll.Image"))); + this.btConfAll.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btConfAll.Name = "btConfAll"; + this.btConfAll.Size = new System.Drawing.Size(75, 22); + this.btConfAll.Text = "일괄승인"; + this.btConfAll.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStrip1 // @@ -304,6 +323,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; @@ -327,6 +347,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; @@ -352,6 +373,7 @@ // 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); // @@ -468,6 +490,7 @@ this.descriptionDataGridViewTextBoxColumn}); this.dv1.DataSource = this.bs; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dv1.Location = new System.Drawing.Point(0, 0); this.dv1.Name = "dv1"; this.dv1.RowTemplate.Height = 23; @@ -475,16 +498,161 @@ this.dv1.TabIndex = 3; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); // - // bs + // wwDataGridViewTextBoxColumn // - this.bs.DataMember = "JobReport"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Sort = "pdate desc"; + this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; + this.wwDataGridViewTextBoxColumn.HeaderText = "WW"; + this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; + this.wwDataGridViewTextBoxColumn.ReadOnly = true; + this.wwDataGridViewTextBoxColumn.Width = 50; // - // dsMSSQL + // pdateDataGridViewTextBoxColumn // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20; + this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + this.pdateDataGridViewTextBoxColumn.ReadOnly = true; + this.pdateDataGridViewTextBoxColumn.Width = 51; + // + // WeekName + // + this.WeekName.DataPropertyName = "WeekName"; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.WeekName.DefaultCellStyle = dataGridViewCellStyle21; + 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 = 32; + // + // usernameDataGridViewTextBoxColumn + // + this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; + this.usernameDataGridViewTextBoxColumn.HeaderText = "담당"; + this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; + this.usernameDataGridViewTextBoxColumn.ReadOnly = true; + this.usernameDataGridViewTextBoxColumn.Width = 51; + // + // requestpartDataGridViewTextBoxColumn + // + this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; + this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; + this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; + this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; + this.requestpartDataGridViewTextBoxColumn.Width = 61; + // + // packageDataGridViewTextBoxColumn + // + this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; + this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; + this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; + this.packageDataGridViewTextBoxColumn.ReadOnly = true; + this.packageDataGridViewTextBoxColumn.Width = 61; + // + // statusDataGridViewTextBoxColumn + // + this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22; + this.statusDataGridViewTextBoxColumn.HeaderText = "상태"; + this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; + this.statusDataGridViewTextBoxColumn.ReadOnly = true; + this.statusDataGridViewTextBoxColumn.Width = 51; + // + // svalueDataGridViewTextBoxColumn + // + this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue"; + this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; + this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; + this.svalueDataGridViewTextBoxColumn.ReadOnly = true; + this.svalueDataGridViewTextBoxColumn.Width = 61; + // + // otDataGridViewTextBoxColumn + // + this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Red; + dataGridViewCellStyle23.Format = "N1"; + this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23; + this.otDataGridViewTextBoxColumn.HeaderText = "초과"; + this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; + this.otDataGridViewTextBoxColumn.ReadOnly = true; + this.otDataGridViewTextBoxColumn.Width = 51; + // + // ot2DataGridViewTextBoxColumn + // + this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2"; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + dataGridViewCellStyle24.Format = "N1"; + this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24; + this.ot2DataGridViewTextBoxColumn.HeaderText = "승인"; + this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn"; + this.ot2DataGridViewTextBoxColumn.Width = 51; + // + // otReasonDataGridViewTextBoxColumn + // + this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason"; + dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle25; + this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유"; + this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn"; + this.otReasonDataGridViewTextBoxColumn.Width = 51; + // + // otStartDataGridViewTextBoxColumn + // + this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart"; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle26.Format = "HH:mm:ss"; + this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle26; + this.otStartDataGridViewTextBoxColumn.HeaderText = "시작"; + this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn"; + this.otStartDataGridViewTextBoxColumn.ReadOnly = true; + this.otStartDataGridViewTextBoxColumn.Visible = false; + this.otStartDataGridViewTextBoxColumn.Width = 54; + // + // otEnd + // + this.otEnd.DataPropertyName = "otEnd"; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + dataGridViewCellStyle27.Format = "HH:mm:ss"; + this.otEnd.DefaultCellStyle = dataGridViewCellStyle27; + this.otEnd.HeaderText = "종료"; + this.otEnd.Name = "otEnd"; + this.otEnd.ReadOnly = true; + this.otEnd.Visible = false; + this.otEnd.Width = 54; + // + // projectNameDataGridViewTextBoxColumn + // + this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; + this.projectNameDataGridViewTextBoxColumn.HeaderText = "프로젝트(아이템)"; + this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; + this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; + this.projectNameDataGridViewTextBoxColumn.Width = 87; + // + // descriptionDataGridViewTextBoxColumn + // + this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; + this.descriptionDataGridViewTextBoxColumn.HeaderText = "비고"; + this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; + this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; + this.descriptionDataGridViewTextBoxColumn.Width = 51; // // tam // @@ -511,162 +679,6 @@ // this.ta.ClearBeforeFill = true; // - // wwDataGridViewTextBoxColumn - // - this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; - 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 = 54; - // - // requestpartDataGridViewTextBoxColumn - // - this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; - this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서"; - this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; - this.requestpartDataGridViewTextBoxColumn.ReadOnly = true; - this.requestpartDataGridViewTextBoxColumn.Width = 78; - // - // packageDataGridViewTextBoxColumn - // - this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; - this.packageDataGridViewTextBoxColumn.HeaderText = "패키지"; - this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; - this.packageDataGridViewTextBoxColumn.ReadOnly = true; - this.packageDataGridViewTextBoxColumn.Width = 66; - // - // statusDataGridViewTextBoxColumn - // - this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; - 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 = 54; - // - // svalueDataGridViewTextBoxColumn - // - this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue"; - this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류"; - this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn"; - this.svalueDataGridViewTextBoxColumn.ReadOnly = true; - 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 - // - this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; - this.projectNameDataGridViewTextBoxColumn.HeaderText = "프로젝트(아이템)"; - this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; - this.projectNameDataGridViewTextBoxColumn.ReadOnly = true; - this.projectNameDataGridViewTextBoxColumn.Width = 87; - // - // descriptionDataGridViewTextBoxColumn - // - this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; - this.descriptionDataGridViewTextBoxColumn.HeaderText = "비고"; - this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; - this.descriptionDataGridViewTextBoxColumn.ReadOnly = true; - this.descriptionDataGridViewTextBoxColumn.Width = 51; - // // fOTConfirm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -682,6 +694,8 @@ ((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); @@ -689,8 +703,6 @@ ((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(); @@ -735,8 +747,7 @@ private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.SplitContainer splitContainer1; private arCtl.arDatagridView dv1; - private System.Windows.Forms.ToolStripButton btEdit; - private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btConfAll; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; @@ -754,5 +765,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn otEnd; private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; + private System.Windows.Forms.ToolStripButton btConf; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs index ec0e2ae..b4e0cbe 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs @@ -17,7 +17,7 @@ namespace FPJ0000 { InitializeComponent(); fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); - this.dsMSSQL.JobReport.TableNewRow += Projects_TableNewRow; + //this.dsMSSQL.JobReport.TableNewRow += Projects_TableNewRow; this.FormClosed += __Closed; dtSD.KeyDown += dtSD_KeyDown; @@ -46,7 +46,7 @@ namespace FPJ0000 //cmbProcess.Items.Clear(); //cmbProcess.Items.Add("--전체--"); - + List fprclist = new List(); foreach (dsReport.ProcessListRow dr in dtProcList) @@ -65,15 +65,23 @@ namespace FPJ0000 // this.cmbUser.Items.Add(namestr); UpdateUserList(); //현재사용자의 이름을 반환한다 + + btConf.Visible = curLevel >= 5; + btConfAll.Visible = curLevel >= 5; + + + this.dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + if (curLevel >= 5) { + //dv1.EditMode = DataGridViewEditMode.EditOnKeystrokeOrF2; if (cmbUser.Items.Count > 0) cmbUser.SelectedIndex = 0; } else { cmbUser.Text = namestr; - dv1.EditMode = DataGridViewEditMode.EditProgrammatically; + //dv1.EditMode = DataGridViewEditMode.EditProgrammatically; } @@ -104,12 +112,6 @@ namespace FPJ0000 //일반사용자의경우에는 상태를 변경하지 못한다. - if (curLevel >= 5) - { - - } - else btEdit.Enabled = false; - //210930- if (FCOMMON.info.NotShowJobReportview) @@ -129,7 +131,7 @@ namespace FPJ0000 var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); var prclist = this.tbProcess.Tag as List; - if (prclist == null || prclist.Count < 1) + if (prclist == null || prclist.Count < 1) { var processStr = "%"; var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); @@ -296,35 +298,19 @@ namespace FPJ0000 { - } - void funcSave() - { - this.Validate(); - this.bs.EndEdit(); - try - { - var cnt = ta.Update(this.dsMSSQL.JobReport); - util.MsgI($"{cnt}건의 자료가 저장되었습니다"); - //this.tam.UpdateAll(this.dsMSSQL); - FormattingData(); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); - } } - void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) - { - e.Row["gcode"] = FCOMMON.info.Login.gcode; - e.Row["pdate"] = DateTime.Now.ToShortDateString(); - e.Row["wuid"] = FCOMMON.info.Login.no; - e.Row["wdate"] = DateTime.Now; - e.Row["status"] = "진행 완료";//other - e.Row["uid"] = FCOMMON.info.Login.no; //이름을 직접 기록 - e.Row["hrs"] = 8.0; - e.Row["ot"] = 0.0; - } + //void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) + //{ + // e.Row["gcode"] = FCOMMON.info.Login.gcode; + // e.Row["pdate"] = DateTime.Now.ToShortDateString(); + // e.Row["wuid"] = FCOMMON.info.Login.no; + // e.Row["wdate"] = DateTime.Now; + // e.Row["status"] = "진행 완료";//other + // e.Row["uid"] = FCOMMON.info.Login.no; //이름을 직접 기록 + // e.Row["hrs"] = 8.0; + // e.Row["ot"] = 0.0; + //} private void refreshToolStripMenuItem_Click(object sender, EventArgs e) { @@ -420,7 +406,7 @@ namespace FPJ0000 private void btEdit_Click(object sender, EventArgs e) { - funcSave(); + // funcSave(); } private void lbStt_Click(object sender, EventArgs e) @@ -495,19 +481,64 @@ namespace FPJ0000 var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다"); if (dlg != DialogResult.Yes) return; + var sb = new System.Text.StringBuilder(); foreach (dsPRJ.JobReportRow dr in this.dsMSSQL.JobReport) { if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue; if (dr.ot2 == 0) { + if (dr.FreeDay) dr.ot2 = dr.ot * 1.5; else dr.ot2 = dr.ot; + + sb.Append($"{dr.username}:{dr.uid} 요청:{dr.ot},승인:{dr.ot2},비고:일괄"); } dr.EndEdit(); } - util.MsgI("모든 시간을 적용 했습니다. 적용하려면 '저장' 버튼을 누르세요"); - //funcDelete(); + this.Validate(); + this.bs.EndEdit(); + try + { + var cnt = ta.Update(this.dsMSSQL.JobReport); + dsMSSQL.JobReport.AcceptChanges(); + util.MsgI($"{cnt}건의 자료가 저장되었습니다"); + FCOMMON.DBM.InsertLog("OTCONFIRM", sb.ToString()); + FormattingData(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); + } + } + + private void toolStripButton3_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPRJ.JobReportRow; + using (var f = new OtConfirm.fOTConfirmOK(dr)) + { + if (f.ShowDialog() == DialogResult.OK) + { + dr.EndEdit(); + try + { + var cnt = ta.Update(dr); + dr.AcceptChanges(); + util.MsgI($"{cnt}건의 자료가 저장되었습니다"); + FCOMMON.DBM.InsertLog("OTCONFIRM", $"{dr.username}:{dr.uid},요청:{dr.ot},승인:{dr.ot2},관리자비고:{dr.otReason}"); + FormattingData(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); + } + + + } + } + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx index 9eaa403..f2a5d5c 100644 --- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx @@ -181,34 +181,23 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - 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= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70MohSym7Ui9J0TQ26 + moqZtzVFKxNdGGSLaWReQhMVKkQpelGhXXRaU3PO6YabZK6pa8674GWpu5yz7Zz57TlnSw2CfvDhefGc + 74fz+54j4CbynirlbJlWea5c+0so01LkpHkquFNHnyvrp6Mfa4wnpOqqvbFvtvGhrRP1sFe9aKeXjSYz + a3O6YXNssmznoDEyb0fhx2kklI+6RDcV2wNR/8SUaBaNoxa2f9IL3RQD3TQD7SQDzYQHqp9utJuccDNA + yyiFwvdTSH9qpP6SCGXt1JrLA8MMi8EZhpwMBniJBz0WN76YXETgg2GehW7Oi2LFNMLvdr3mw/EVYdYr + sth1Se0lpNdcRs3nRhQ1VSBcFowwgqj4OCLlR1DZUsmv4qAZLKy4EJnSw/CCuLLwd13DrWg1v0CNNp+X + JFdHI/9VEm41JkBcdx5pdWloGVpAq9GBT9/XsEp6Esp7aV4gqhJtPyzLYbVj3Xg5LEep6iYvSamNIeEL + yHyWAbXFya/SaaagJD2sOL0QFvX5BdxElfTQufWp0Fs0qNPdwaOOPMRXnEZKdSz0ky7oSbFcwepxfyc2 + IoiUbxGcvC/zHi3YjaQqEQzj/SjuzoJckYuEJxFoVH3At1kGelJs/4QXfYRFuxfhDwKCg9IgSah0F241 + JOJqbRQSK8/wklxFEqRNGeRNIsDdG6ZZDHCfmGAnRYbkaPyCUOmO2VDpTvJQEELzg3CxNALZz1OhNilR + rCxA1ttUiGvjoCcCHfk3tERAe31EoNpc4VROLz2/SmNoluXpGZvD7fpMXCdBSV0C8hpubNxxuDwsETRv + CjjbjG1T8D+c3AoZWwTHcr+6VIaR9X89/C/M4xO+/cktjkCcFJnZYZ1ac9lVg2M+6xIF6yIFS4Alh5eH + a95BszCZrT6Kolb3XGv7EYgLBIcyP2eHiNs7DkiUthBJM73BdT/BfxA303vEbSv70to6g1MV6QKBQPAb + LVefkczmSCQAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE1SURBVDhPY/hPIQAbcOn57//T915BwW1rjoFx/oJz//N6 - VqHgsNxeMA03YN3lp/9vv4YYhAtsuQ6h55/9A8aBidVgPtiADZcegzWDFN1/9///qy8IDOKDcPfu1/9/ - /vn/v3rt/f9TD38BuwJuwIrT9wka0L79BdiAkuW3MA0A+fnog///V12GKAZ5BxcGGQByDYoXYAbA/Aey - AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs - 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG - GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= - - - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG @@ -223,6 +212,24 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 17, 17 + 393, 17 @@ -269,6 +276,15 @@ True + + True + + + True + + + True + 186, 17 diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs new file mode 100644 index 0000000..929c67d --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.Designer.cs @@ -0,0 +1,296 @@ + +namespace FPJ0000.OtConfirm +{ + partial class fOTConfirmOK + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.label1 = new System.Windows.Forms.Label(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSKuntae = new FPJ0000.DSKuntae(); + this.tbRemark = new System.Windows.Forms.RichTextBox(); + this.grpUser = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.grpAdmin = new System.Windows.Forms.GroupBox(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.tbResponse = new System.Windows.Forms.RichTextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); + this.textBox2 = new System.Windows.Forms.TextBox(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); + this.grpUser.SuspendLayout(); + this.grpAdmin.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(38, 42); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(93, 27); + this.label1.TabIndex = 2; + this.label1.Text = "업무일"; + // + // bs + // + this.bs.DataMember = "EETGW_HolydayRequest"; + this.bs.DataSource = this.dSKuntae; + // + // dSKuntae + // + this.dSKuntae.DataSetName = "DSKuntae"; + this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // tbRemark + // + this.tbRemark.BackColor = System.Drawing.Color.WhiteSmoke; + this.tbRemark.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbRemark.Location = new System.Drawing.Point(140, 123); + this.tbRemark.Name = "tbRemark"; + this.tbRemark.ReadOnly = true; + this.tbRemark.Size = new System.Drawing.Size(878, 133); + this.tbRemark.TabIndex = 16; + this.tbRemark.Text = ""; + // + // grpUser + // + this.grpUser.Controls.Add(this.textBox2); + this.grpUser.Controls.Add(this.textBox1); + this.grpUser.Controls.Add(this.textBox3); + this.grpUser.Controls.Add(this.label10); + this.grpUser.Controls.Add(this.label5); + this.grpUser.Controls.Add(this.tbRemark); + this.grpUser.Controls.Add(this.label1); + this.grpUser.Controls.Add(this.label4); + this.grpUser.Dock = System.Windows.Forms.DockStyle.Top; + this.grpUser.Location = new System.Drawing.Point(3, 3); + this.grpUser.Name = "grpUser"; + this.grpUser.Size = new System.Drawing.Size(1029, 273); + this.grpUser.TabIndex = 0; + this.grpUser.TabStop = false; + this.grpUser.Text = "업무일지 정보"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(631, 37); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(387, 38); + this.textBox1.TabIndex = 18; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(140, 79); + this.textBox3.Name = "textBox3"; + this.textBox3.ReadOnly = true; + this.textBox3.Size = new System.Drawing.Size(878, 38); + this.textBox3.TabIndex = 17; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(11, 86); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(120, 27); + this.label10.TabIndex = 13; + this.label10.Text = "프로젝트"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(532, 40); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(93, 27); + this.label5.TabIndex = 0; + this.label5.Text = "담당자"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(65, 133); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(66, 27); + this.label4.TabIndex = 15; + this.label4.Text = "비고"; + // + // grpAdmin + // + this.grpAdmin.Controls.Add(this.numericUpDown2); + this.grpAdmin.Controls.Add(this.numericUpDown1); + this.grpAdmin.Controls.Add(this.label11); + this.grpAdmin.Controls.Add(this.label7); + this.grpAdmin.Controls.Add(this.tbResponse); + this.grpAdmin.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpAdmin.Location = new System.Drawing.Point(3, 276); + this.grpAdmin.Name = "grpAdmin"; + this.grpAdmin.Size = new System.Drawing.Size(1029, 267); + this.grpAdmin.TabIndex = 1; + this.grpAdmin.TabStop = false; + this.grpAdmin.Text = "관리자 승인"; + // + // numericUpDown2 + // + this.numericUpDown2.DecimalPlaces = 1; + this.numericUpDown2.Location = new System.Drawing.Point(293, 39); + this.numericUpDown2.Maximum = new decimal(new int[] { + -727379969, + 232, + 0, + 0}); + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.ReadOnly = true; + this.numericUpDown2.Size = new System.Drawing.Size(157, 38); + this.numericUpDown2.TabIndex = 27; + this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // numericUpDown1 + // + this.numericUpDown1.DecimalPlaces = 1; + this.numericUpDown1.Location = new System.Drawing.Point(861, 37); + this.numericUpDown1.Maximum = new decimal(new int[] { + -727379969, + 232, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(157, 38); + this.numericUpDown1.TabIndex = 26; + this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(636, 41); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(219, 27); + this.label11.TabIndex = 25; + this.label11.Text = "담당자 승인 시간"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(11, 47); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(276, 27); + this.label7.TabIndex = 23; + this.label7.Text = "담당자 O/T 입력 시간"; + // + // tbResponse + // + this.tbResponse.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbResponse.Location = new System.Drawing.Point(10, 94); + this.tbResponse.Name = "tbResponse"; + this.tbResponse.Size = new System.Drawing.Size(1008, 108); + this.tbResponse.TabIndex = 3; + this.tbResponse.Text = ""; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(3, 493); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(1029, 50); + this.button1.TabIndex = 2; + this.button1.Text = "확인"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(139, 35); + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.Size = new System.Drawing.Size(387, 38); + this.textBox2.TabIndex = 19; + // + // fOTConfirmOK + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1035, 546); + this.Controls.Add(this.button1); + this.Controls.Add(this.grpAdmin); + this.Controls.Add(this.grpUser); + this.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fOTConfirmOK"; + this.Padding = new System.Windows.Forms.Padding(3); + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "OT 승인/취소 작업"; + this.Load += new System.EventHandler(this.fHolyRequestAdd_Load); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit(); + this.grpUser.ResumeLayout(false); + this.grpUser.PerformLayout(); + this.grpAdmin.ResumeLayout(false); + this.grpAdmin.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.RichTextBox tbRemark; + private System.Windows.Forms.GroupBox grpUser; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.GroupBox grpAdmin; + private System.Windows.Forms.RichTextBox tbResponse; + private System.Windows.Forms.Button button1; + private DSKuntae dSKuntae; + private System.Windows.Forms.BindingSource bs; + private DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter ta; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.NumericUpDown numericUpDown2; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs new file mode 100644 index 0000000..4df3ad5 --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FPJ0000.OtConfirm +{ + public partial class fOTConfirmOK : Form + { + dsPRJ.JobReportRow dr; + Boolean binit = false; + public fOTConfirmOK(dsPRJ.JobReportRow dr_) + { + InitializeComponent(); + dr = dr_; + + //var userlist = FCOMMON.DBM.getUserTable(); + //this.cmbUser.DataSource = userlist; + //this.cmbUser.ValueMember = "id"; + //this.cmbUser.DisplayMember = "dispname"; + + textBox1.Text = dr.username; + textBox2.Text = dr.pdate; + textBox3.Text = dr.projectName; + tbRemark.Text = dr.description; + numericUpDown2.Value = (decimal)dr.ot; + tbRemark.ImeMode = ImeMode.Hangul; + + + + var dt = DateTime.Parse(dr.pdate); + textBox2.Text = dt.ToLongDateString(); + + if(dt.DayOfWeek == DayOfWeek.Sunday || dt.DayOfWeek == DayOfWeek.Saturday) + { + numericUpDown1.Value = (decimal)(dr.ot * 1.5f); + } + else + { + numericUpDown1.Value = (decimal)dr.ot; + } + } + + int curLevel = 0; + private void fHolyRequestAdd_Load(object sender, EventArgs e) + { + curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); + button1.Enabled = curLevel >= 5; + + + binit = true; + } + + private void button1_Click(object sender, EventArgs e) + { + var intime = (float)numericUpDown1.Value; + if (intime == 0f) + { + var dlg = FCOMMON.Util.MsgQ("승인시간이 입력되지 않았습니다. 저장 할까요?\n해당 자료는 미승인 자료가 됩니다"); + if (dlg != DialogResult.Yes) return; + } + else + { + var dlg = FCOMMON.Util.MsgQ("승인시간을 입력할까요?\n" + + $"요청:{numericUpDown2.Value},승인:{numericUpDown1.Value}\n" + + $"비고:{tbResponse.Text}\n" + + $"바로 저장 됩니다"); + + if (dlg != DialogResult.Yes) return; + } + + dr.ot2 = (float)this.numericUpDown1.Value; + dr.otReason = this.tbResponse.Text.Trim(); + dr.EndEdit(); + + DialogResult = DialogResult.OK; + } + + + } +} diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx new file mode 100644 index 0000000..e995ea4 --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOTConfirmOK.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 122, 17 + + + 17, 17 + + + 186, 17 + + \ No newline at end of file