diff --git a/Project/Controller/IoController.cs b/Project/Controller/IoController.cs deleted file mode 100644 index 902df59..0000000 --- a/Project/Controller/IoController.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class IoController : BaseController - { - [HttpPost] - public void Index([FromBody] string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - var tabledata = string.Empty; - for(int r = 0;r < 8; r++) - { - tabledata += ""; - for (int i = 0; i < 8; i++) - { - tabledata += $""; - tabledata += $"
"; - tabledata += $"
"; - tabledata += $"
X{i.ToString("00")}
"; - tabledata += $"

Start button

"; - tabledata += $"
"; ; - tabledata += $"
"; - tabledata += $""; - } - tabledata += ""; - } - - contents = contents.Replace("{list}", tabledata); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} diff --git a/Project/Controller/MotionController.cs b/Project/Controller/MotionController.cs deleted file mode 100644 index 48ed317..0000000 --- a/Project/Controller/MotionController.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class MotionController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} diff --git a/Project/Controller/OperationController.cs b/Project/Controller/OperationController.cs deleted file mode 100644 index 341d417..0000000 --- a/Project/Controller/OperationController.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class OperationController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index fdb290e..bc9b0f3 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -231,9 +231,6 @@ - - - diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 3a5ea0f..71bf6e2 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("21.04.19.1212")] -[assembly: AssemblyFileVersion("21.04.19.1212")] +[assembly: AssemblyVersion("21.05.12.1430")] +[assembly: AssemblyFileVersion("21.05.12.1430")] diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 37fa1ba..e99d099 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -1149,7 +1149,7 @@ WHERE (idx = @idx) - + @@ -1290,7 +1290,7 @@ WHERE (idx = @idx) - + @@ -1361,7 +1361,7 @@ WHERE (idx = @idx) - + @@ -1419,7 +1419,7 @@ WHERE (idx = @idx) - + @@ -1489,7 +1489,7 @@ WHERE (idx = @idx) - + @@ -1537,7 +1537,7 @@ WHERE (idx = @idx) - + @@ -1547,7 +1547,7 @@ WHERE (idx = @idx) - + @@ -1576,7 +1576,7 @@ WHERE (idx = @idx) - + @@ -1692,7 +1692,7 @@ WHERE (idx = @idx) - + @@ -1731,7 +1731,7 @@ WHERE (idx = @idx) - + diff --git a/SubProject/FCM0000/fCode.Designer.cs b/SubProject/FCM0000/fCode.Designer.cs index 4a5f372..6c1ccaf 100644 --- a/SubProject/FCM0000/fCode.Designer.cs +++ b/SubProject/FCM0000/fCode.Designer.cs @@ -60,6 +60,7 @@ this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ta = new FCM0000.dsMSSQLTableAdapters.CommonTableAdapter(); this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.s가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -193,6 +194,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"; @@ -243,7 +245,8 @@ // this.toolStripButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.코드일괄생성ToolStripMenuItem, - this.title가져오기ToolStripMenuItem}); + this.title가져오기ToolStripMenuItem, + this.s가져오기ToolStripMenuItem}); this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; @@ -254,14 +257,14 @@ // 코드일괄생성ToolStripMenuItem // this.코드일괄생성ToolStripMenuItem.Name = "코드일괄생성ToolStripMenuItem"; - this.코드일괄생성ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.코드일괄생성ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.코드일괄생성ToolStripMenuItem.Text = "코드일괄생성"; this.코드일괄생성ToolStripMenuItem.Click += new System.EventHandler(this.코드일괄생성ToolStripMenuItem_Click); // // title가져오기ToolStripMenuItem // this.title가져오기ToolStripMenuItem.Name = "title가져오기ToolStripMenuItem"; - this.title가져오기ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.title가져오기ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.title가져오기ToolStripMenuItem.Text = "Title 가져오기"; this.title가져오기ToolStripMenuItem.Click += new System.EventHandler(this.title가져오기ToolStripMenuItem_Click); // @@ -340,6 +343,13 @@ this.tam.StaffTableAdapter = null; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // s가져오기ToolStripMenuItem + // + this.s가져오기ToolStripMenuItem.Name = "s가져오기ToolStripMenuItem"; + this.s가져오기ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.s가져오기ToolStripMenuItem.Text = "S 가져오기"; + this.s가져오기ToolStripMenuItem.Click += new System.EventHandler(this.s가져오기ToolStripMenuItem_Click); + // // fCode // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); @@ -400,5 +410,6 @@ private System.Windows.Forms.ToolStripMenuItem 코드일괄생성ToolStripMenuItem; private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripMenuItem title가져오기ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem s가져오기ToolStripMenuItem; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index 369c093..b0c46ba 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -138,6 +138,40 @@ namespace FCM0000 } + } + } + + private void s가져오기ToolStripMenuItem_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fInputTextBox(); + if (f.ShowDialog() == DialogResult.OK) + { + var data = f.textBox1.Text.Trim(); + data = data.Replace("\r", ""); + var lines = data.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries); + + var dlg = FCOMMON.Util.MsgQ(lines.Count().ToString() + "건의 자료가 있습니다. 입력할까요?"); + if (dlg == DialogResult.Yes) + { + int r = 0; + foreach (var item in lines) + { + if(r < this.dsMSSQL.Common.Count) + this.dsMSSQL.Common.Rows[r]["svalue"] = item; + + r += 1; + //if (item.Trim().Equals("")) continue; + + //if (this.dsMSSQL.Common.Where(t => t.memo == item.Trim()).Any() == false) + //{ + // var newdr = this.dsMSSQL.Common.NewCommonRow(); + // newdr.memo = item; + // this.dsMSSQL.Common.AddCommonRow(newdr); + //} + } + } + + } } } diff --git a/SubProject/FCM0000/fCode.resx b/SubProject/FCM0000/fCode.resx index c40d815..e02577b 100644 --- a/SubProject/FCM0000/fCode.resx +++ b/SubProject/FCM0000/fCode.resx @@ -213,6 +213,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 186, 17 diff --git a/SubProject/FPJ0000/EBoard/fEBoardReport.cs b/SubProject/FPJ0000/EBoard/fEBoardReport.cs index 411f6c8..7f717c9 100644 --- a/SubProject/FPJ0000/EBoard/fEBoardReport.cs +++ b/SubProject/FPJ0000/EBoard/fEBoardReport.cs @@ -165,7 +165,7 @@ namespace FPJ0000.EBoard { var 분류명 = fpSpread1.Sheets[0].Cells[1, 1 + (i - 1) * 2].Value.ToString(); var 분류데이터 = 기간자료.Where(t => t.uid.Contains(item.Key) && t.분류 == 분류명); - var 건수 = 분류데이터.Count(); + var 건수 = 분류데이터.Sum(t => t.QTY); var 시간 = 분류데이터.Sum(t => t.RepairTime); this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 1].Value = 건수; this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].Value = 시간; diff --git a/SubProject/FPJ0000/EBoardReportCapa.xlsx b/SubProject/FPJ0000/EBoardReportCapa.xlsx index 92b3d7f..98954bd 100644 Binary files a/SubProject/FPJ0000/EBoardReportCapa.xlsx and b/SubProject/FPJ0000/EBoardReportCapa.xlsx differ diff --git a/SubProject/FPJ0000/JobReport_/K5Dailyform.Designer.cs b/SubProject/FPJ0000/JobReport_/K5Dailyform.Designer.cs index 2c103ec..0356f1d 100644 --- a/SubProject/FPJ0000/JobReport_/K5Dailyform.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/K5Dailyform.Designer.cs @@ -45,55 +45,36 @@ FarPoint.Win.Spread.CellType.GeneralCellType generalCellType7 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.NamedStyle namedStyle8 = new FarPoint.Win.Spread.NamedStyle("쉼표 [0] 4"); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType8 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder1 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, false); - FarPoint.Win.LineBorder lineBorder2 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, false, false); - FarPoint.Win.LineBorder lineBorder3 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); - FarPoint.Win.LineBorder lineBorder4 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); - FarPoint.Win.ComplexBorder complexBorder1 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); + FarPoint.Win.ComplexBorder complexBorder1 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType9 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.ComplexBorder complexBorder2 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType10 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType11 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.ComplexBorder complexBorder3 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType12 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType13 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder5 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType14 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.ComplexBorder complexBorder4 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType15 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder6 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType16 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType17 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder7 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder8 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder9 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder10 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType18 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder11 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder12 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder13 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder14 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.LineBorder lineBorder15 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); - FarPoint.Win.ComplexBorder complexBorder5 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType19 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.ComplexBorder complexBorder6 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType20 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder16 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, false, false, true); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType21 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.ComplexBorder complexBorder7 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); - FarPoint.Win.LineBorder lineBorder17 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); - FarPoint.Win.LineBorder lineBorder18 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); - FarPoint.Win.ComplexBorder complexBorder8 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); + FarPoint.Win.ComplexBorder complexBorder2 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); + FarPoint.Win.LineBorder lineBorder1 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); + FarPoint.Win.LineBorder lineBorder2 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 1, true, false, true, true); + FarPoint.Win.ComplexBorder complexBorder3 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType22 = new FarPoint.Win.Spread.CellType.GeneralCellType(); + FarPoint.Win.ComplexBorder complexBorder4 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType23 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder19 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 2, true, false, true, false); + FarPoint.Win.LineBorder lineBorder3 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 2, true, false, true, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType24 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType25 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder20 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 2, true, false, true, false); + FarPoint.Win.LineBorder lineBorder4 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), 2, true, false, true, false); + FarPoint.Win.ComplexBorder complexBorder5 = new FarPoint.Win.ComplexBorder(new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.ThinLine, System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191)))))), new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.None), false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType26 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder21 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); + FarPoint.Win.LineBorder lineBorder5 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType27 = new FarPoint.Win.Spread.CellType.GeneralCellType(); - FarPoint.Win.LineBorder lineBorder22 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); + FarPoint.Win.LineBorder lineBorder6 = new FarPoint.Win.LineBorder(System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))), 1, false, true, false, false); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType28 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.CellType.GeneralCellType generalCellType29 = new FarPoint.Win.Spread.CellType.GeneralCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); @@ -231,7 +212,9 @@ namedStyle8}); this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1191, 595); + this.fpSpread1.ShowRowErrors = true; + this.fpSpread1.Size = new System.Drawing.Size(1191, 627); + this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 3; this.fpSpread1.TabStripPolicy = FarPoint.Win.Spread.TabStripPolicy.Always; this.fpSpread1.TabStripRatio = 0.802D; @@ -369,7 +352,7 @@ // progressBar1 // this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 653); + this.progressBar1.Location = new System.Drawing.Point(0, 685); this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(1191, 23); this.progressBar1.TabIndex = 5; @@ -389,7 +372,7 @@ this.fpSpread1_Sheet1.AddCustomName("DATA11", "\'1월\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("DATA12", "\'1월\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("DATA13", "\'1월\'!#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("DATA14", "\'1월\'!#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("DATA14", "\'1월\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("DATA4", "\'1월\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("DSFS", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ERWE", "#REF!", 0, 0, false, ""); @@ -397,7 +380,7 @@ this.fpSpread1_Sheet1.AddCustomName("K2PBGA_DTA", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("K450004550", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("K4BGA_CHT", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("MD", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("MD", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Overhaul", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("PBU", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("PL", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); @@ -405,7 +388,7 @@ this.fpSpread1_Sheet1.AddCustomName("PRINT_AREA_MI", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Print_Area", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Q", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("Q1p", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("Q1p", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Q2P", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Q3P", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("Q4P", "#REF!", 0, 0, false, ""); @@ -413,7 +396,7 @@ this.fpSpread1_Sheet1.AddCustomName("QFP1_DTA", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("QFP2_CHT", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("QFP2_DTA", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("SIP_DTA", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("SIP_DTA", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("SOIC", "WB!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("SOIC_CHT", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("SOIC_DTA", "#REF!", 0, 0, false, ""); @@ -421,7 +404,7 @@ this.fpSpread1_Sheet1.AddCustomName("TQFP_CHT", "CAPA_CHART!R762C1:R1033C12,CAPA_CHART!R1129C1:R1145C12", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("TQFP_DTA", "\'Eol(K3 TQ)\'!R44C1:R325C24", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("TSOP_CHT", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("TSOP_DTA", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("TSOP_DTA", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("WBG_DTA", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("WEQ", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("_Fill", "\'소방현물\'!#REF!", 0, 0, false, ""); @@ -429,7 +412,7 @@ this.fpSpread1_Sheet1.AddCustomName("_Key2", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("_MatInverse_In", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("_Order1", "255", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("_Order2", "255", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("_Order2", "255", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("_Sort", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("__123Graph_F", "INPUT!R5C12:R336C12", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("__123Graph_X", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); @@ -437,7 +420,7 @@ this.fpSpread1_Sheet1.AddCustomName("aa", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("aaa", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("aaswd", "#REF!,#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("adsfasf", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("adsfasf", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("afasfd", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("afdasf", "\'Eol(K3 TQ)\'!R540C9:R571C9", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("as", "INPUT!R5C12:R336C12", 0, 0, false, ""); @@ -445,7 +428,7 @@ this.fpSpread1_Sheet1.AddCustomName("asdf", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("asdfasf", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("asfdasf", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("asfsadfas", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("asfsadfas", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("asfsafd", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("bbbb", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("d", "\'Eol(K3 TQ)\'!R540C9:R571C9", 0, 0, false, ""); @@ -453,7 +436,7 @@ this.fpSpread1_Sheet1.AddCustomName("erwer", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("etr", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("fdgadf", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("hgy", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("hgy", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("k4bga_dta", "#REF!,#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("new", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("plcc_cht", "#REF!", 0, 0, false, ""); @@ -461,7 +444,7 @@ this.fpSpread1_Sheet1.AddCustomName("sada", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("sdas", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("sdfsdf", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("srfwerwerw", "WB!#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("srfwerwerw", "WB!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ss", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("sss", "{#N/A,#N/A,FALSE,\"전력간선\"}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ssss", @"{#N/A,#N/A,FALSE,""COVER"";#N/A,#N/A,FALSE,""부문목표"";#N/A,#N/A,FALSE,""팀목표"";#N/A,#N/A,FALSE,""세부추진계획"";#N/A,#N/A,FALSE,""결과평가"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-Office"";#N/A,#N/A,FALSE,""인력계획-QC"";#N/A,#N/A,FALSE,""인력계획-QE"";#N/A,#N/A,FALSE,""인력계획-Rel"";#N/A,#N/A,FALSE,""Team-sum"";#N/A,#N/A,FALSE,""office"";#N/A,#N/A,FALSE,""QC"";#N/A,#N/A,FALSE,""QE"";#N/A,#N/A,FALSE,""Rel"";#N/A,#N/A,FALSE,""전략예산"";#N/A,#N/A,FALSE,""Team-only"";#N/A,#N/A,FALSE,""조정"";#N/A,#N/A,FALSE,""투자-sum"";#N/A,#N/A,FALSE,""투자계획"";#N/A,#N/A,FALSE,""투자계획-pc""}", 0, 0, false, ""); @@ -469,7 +452,7 @@ this.fpSpread1_Sheet1.AddCustomName("tqfp", "INPUT!R5C23:R488C23", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("tqfp_chr1", "CAPA_CHART!R656C1:R996C11,CAPA_CHART!R997C1:R1012C11", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("trywty", "#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("uuuu", "{#N/A,#N/A,FALSE,\"전력간선\"}", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("uuuu", "{#N/A,#N/A,FALSE,\"전력간선\"}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("weqw", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("wr.팀억적평가2", "{#N/A,#N/A,TRUE,\"COVER \";#N/A,#N/A,TRUE,\"업적관리(결과)-1팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-1" + "팀 \";#N/A,#N/A,TRUE,\"업적관리(결과)-2팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-2팀 \";#N/A,#N/A,TRUE,\"업" + @@ -482,7 +465,7 @@ "팀 \";#N/A,#N/A,TRUE,\"업적관리(결과)-2팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-2팀 \";#N/A,#N/A,TRUE,\"업" + "적관리(결과)-3팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-3팀 \"}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ww", "WB!#REF!", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("ㄱㄷㅅㄷㅅ", "#REF!,#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("ㄱㄷㅅㄷㅅ", "#REF!,#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ㄴㅇㄷㅁㅇㅈㅂㅇㅈㄷ", @"{#N/A,#N/A,FALSE,""COVER"";#N/A,#N/A,FALSE,""부문목표"";#N/A,#N/A,FALSE,""팀목표"";#N/A,#N/A,FALSE,""세부추진계획"";#N/A,#N/A,FALSE,""결과평가"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-Office"";#N/A,#N/A,FALSE,""인력계획-QC"";#N/A,#N/A,FALSE,""인력계획-QE"";#N/A,#N/A,FALSE,""인력계획-Rel"";#N/A,#N/A,FALSE,""Team-sum"";#N/A,#N/A,FALSE,""office"";#N/A,#N/A,FALSE,""QC"";#N/A,#N/A,FALSE,""QE"";#N/A,#N/A,FALSE,""Rel"";#N/A,#N/A,FALSE,""전략예산"";#N/A,#N/A,FALSE,""Team-only"";#N/A,#N/A,FALSE,""조정"";#N/A,#N/A,FALSE,""투자-sum"";#N/A,#N/A,FALSE,""투자계획"";#N/A,#N/A,FALSE,""투자계획-pc""}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ㅂ", "\'소방현물\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("ㅇㄹㄶㅇㅀ", "#REF!", 0, 0, false, ""); @@ -492,7 +475,7 @@ this.fpSpread1_Sheet1.AddCustomName("ㅠㅍ", "{#N/A,#N/A,TRUE,\"COVER \";#N/A,#N/A,TRUE,\"업적관리(결과)-1팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-1" + "팀 \";#N/A,#N/A,TRUE,\"업적관리(결과)-2팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-2팀 \";#N/A,#N/A,TRUE,\"업" + "적관리(결과)-3팀\";#N/A,#N/A,TRUE,\"업적관리(과정)-3팀 \"}", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("ㅠ츛ㅊㅌㅌ", "#REF!", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("ㅠ츛ㅊㅌㅌ", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("개선전도면", "\'소방현물\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("교육", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("권순재", "#REF!", 0, 0, false, ""); @@ -500,12 +483,13 @@ this.fpSpread1_Sheet1.AddCustomName("실적", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("연습", "#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("예산", @"{#N/A,#N/A,FALSE,""COVER"";#N/A,#N/A,FALSE,""부문목표"";#N/A,#N/A,FALSE,""팀목표"";#N/A,#N/A,FALSE,""세부추진계획"";#N/A,#N/A,FALSE,""결과평가"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-Office"";#N/A,#N/A,FALSE,""인력계획-QC"";#N/A,#N/A,FALSE,""인력계획-QE"";#N/A,#N/A,FALSE,""인력계획-Rel"";#N/A,#N/A,FALSE,""Team-sum"";#N/A,#N/A,FALSE,""office"";#N/A,#N/A,FALSE,""QC"";#N/A,#N/A,FALSE,""QE"";#N/A,#N/A,FALSE,""Rel"";#N/A,#N/A,FALSE,""전략예산"";#N/A,#N/A,FALSE,""Team-only"";#N/A,#N/A,FALSE,""조정"";#N/A,#N/A,FALSE,""투자-sum"";#N/A,#N/A,FALSE,""투자계획"";#N/A,#N/A,FALSE,""투자계획-pc""}", 0, 0, false, ""); - this.fpSpread1_Sheet1.AddCustomName("인라인", @"{#N/A,#N/A,FALSE,""COVER"";#N/A,#N/A,FALSE,""부문목표"";#N/A,#N/A,FALSE,""팀목표"";#N/A,#N/A,FALSE,""세부추진계획"";#N/A,#N/A,FALSE,""결과평가"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-Office"";#N/A,#N/A,FALSE,""인력계획-QC"";#N/A,#N/A,FALSE,""인력계획-QE"";#N/A,#N/A,FALSE,""인력계획-Rel"";#N/A,#N/A,FALSE,""Team-sum"";#N/A,#N/A,FALSE,""office"";#N/A,#N/A,FALSE,""QC"";#N/A,#N/A,FALSE,""QE"";#N/A,#N/A,FALSE,""Rel"";#N/A,#N/A,FALSE,""전략예산"";#N/A,#N/A,FALSE,""Team-only"";#N/A,#N/A,FALSE,""조정"";#N/A,#N/A,FALSE,""투자-sum"";#N/A,#N/A,FALSE,""투자계획"";#N/A,#N/A,FALSE,""투자계획-pc""}", 0, 0, false, null); + this.fpSpread1_Sheet1.AddCustomName("인라인", @"{#N/A,#N/A,FALSE,""COVER"";#N/A,#N/A,FALSE,""부문목표"";#N/A,#N/A,FALSE,""팀목표"";#N/A,#N/A,FALSE,""세부추진계획"";#N/A,#N/A,FALSE,""결과평가"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-1팀"";#N/A,#N/A,FALSE,""인력계획-Office"";#N/A,#N/A,FALSE,""인력계획-QC"";#N/A,#N/A,FALSE,""인력계획-QE"";#N/A,#N/A,FALSE,""인력계획-Rel"";#N/A,#N/A,FALSE,""Team-sum"";#N/A,#N/A,FALSE,""office"";#N/A,#N/A,FALSE,""QC"";#N/A,#N/A,FALSE,""QE"";#N/A,#N/A,FALSE,""Rel"";#N/A,#N/A,FALSE,""전략예산"";#N/A,#N/A,FALSE,""Team-only"";#N/A,#N/A,FALSE,""조정"";#N/A,#N/A,FALSE,""투자-sum"";#N/A,#N/A,FALSE,""투자계획"";#N/A,#N/A,FALSE,""투자계획-pc""}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("작", "{#N/A,#N/A,FALSE,\"전력간선\"}", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("장비", "WB!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("장비1", "WB!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("장비현황", "\'Eol(K3 TQ)\'!#REF!", 0, 0, false, ""); this.fpSpread1_Sheet1.AddCustomName("현조", "#REF!", 0, 0, false, ""); + this.fpSpread1_Sheet1.AutoGenerateColumns = false; this.fpSpread1_Sheet1.Cells.Get(1, 1).BackColor = System.Drawing.SystemColors.Window; this.fpSpread1_Sheet1.Cells.Get(1, 1).Font = new System.Drawing.Font("맑은 고딕", 20F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(1, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(32)))), ((int)(((byte)(96))))); @@ -518,7 +502,7 @@ this.fpSpread1_Sheet1.Cells.Get(2, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Cells.Get(2, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(3, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(3, 1).Border = lineBorder1; + this.fpSpread1_Sheet1.Cells.Get(3, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(3, 1).ColumnSpan = 2; this.fpSpread1_Sheet1.Cells.Get(3, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(3, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); @@ -527,19 +511,19 @@ this.fpSpread1_Sheet1.Cells.Get(3, 1).Value = "ITEM"; this.fpSpread1_Sheet1.Cells.Get(3, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(3, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(3, 2).Border = lineBorder2; + this.fpSpread1_Sheet1.Cells.Get(3, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(3, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(3, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(3, 2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(3, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(4, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(4, 1).Border = lineBorder3; + this.fpSpread1_Sheet1.Cells.Get(4, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(4, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(4, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(4, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(4, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(4, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(4, 2).Border = lineBorder4; + this.fpSpread1_Sheet1.Cells.Get(4, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(4, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(4, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(4, 2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -562,7 +546,7 @@ this.fpSpread1_Sheet1.Cells.Get(5, 1).Value = "Tech. Support \nSummary"; this.fpSpread1_Sheet1.Cells.Get(5, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(5, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); - this.fpSpread1_Sheet1.Cells.Get(5, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(5, 2).Border = complexBorder1; generalCellType10.FormatString = "\"건\""; generalCellType10.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType10.NumberFormat.CurrencyDecimalDigits = 2; @@ -576,6 +560,7 @@ this.fpSpread1_Sheet1.Cells.Get(5, 2).Value = "Completed"; this.fpSpread1_Sheet1.Cells.Get(5, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(6, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); + this.fpSpread1_Sheet1.Cells.Get(6, 1).Border = complexBorder1; generalCellType11.FormatString = "\"건\""; generalCellType11.Multiline = true; generalCellType11.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -590,7 +575,7 @@ this.fpSpread1_Sheet1.Cells.Get(6, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(6, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(6, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); - this.fpSpread1_Sheet1.Cells.Get(6, 2).Border = complexBorder3; + this.fpSpread1_Sheet1.Cells.Get(6, 2).Border = complexBorder1; generalCellType12.FormatString = "P"; generalCellType12.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType12.NumberFormat.PercentDecimalDigits = 1; @@ -602,13 +587,14 @@ this.fpSpread1_Sheet1.Cells.Get(6, 2).Value = "On-going"; this.fpSpread1_Sheet1.Cells.Get(6, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(7, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); + this.fpSpread1_Sheet1.Cells.Get(7, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(7, 1).CellType = generalCellType11; this.fpSpread1_Sheet1.Cells.Get(7, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(7, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(7, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(7, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(7, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); - this.fpSpread1_Sheet1.Cells.Get(7, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(7, 2).Border = complexBorder1; generalCellType13.FormatString = "\"건\""; generalCellType13.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType13.NumberFormat.CurrencyDecimalDigits = 2; @@ -622,13 +608,14 @@ this.fpSpread1_Sheet1.Cells.Get(7, 2).Value = "건수"; this.fpSpread1_Sheet1.Cells.Get(7, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(8, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); + this.fpSpread1_Sheet1.Cells.Get(8, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(8, 1).CellType = generalCellType11; this.fpSpread1_Sheet1.Cells.Get(8, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(8, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(8, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(8, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(8, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); - this.fpSpread1_Sheet1.Cells.Get(8, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(8, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(8, 2).CellType = generalCellType10; this.fpSpread1_Sheet1.Cells.Get(8, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(8, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -636,13 +623,14 @@ this.fpSpread1_Sheet1.Cells.Get(8, 2).Value = "Hrs"; this.fpSpread1_Sheet1.Cells.Get(8, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(9, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(242)))), ((int)(((byte)(204))))); + this.fpSpread1_Sheet1.Cells.Get(9, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(9, 1).CellType = generalCellType11; this.fpSpread1_Sheet1.Cells.Get(9, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(9, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(9, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(9, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(9, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(203)))), ((int)(((byte)(173))))); - this.fpSpread1_Sheet1.Cells.Get(9, 2).Border = lineBorder5; + this.fpSpread1_Sheet1.Cells.Get(9, 2).Border = complexBorder1; generalCellType14.FormatString = "P"; generalCellType14.Multiline = true; generalCellType14.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -656,7 +644,7 @@ this.fpSpread1_Sheet1.Cells.Get(9, 2).Value = "Technical Support"; this.fpSpread1_Sheet1.Cells.Get(9, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(10, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); - this.fpSpread1_Sheet1.Cells.Get(10, 1).Border = complexBorder4; + this.fpSpread1_Sheet1.Cells.Get(10, 1).Border = complexBorder1; generalCellType15.FormatString = "P"; generalCellType15.Multiline = true; generalCellType15.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -667,11 +655,11 @@ this.fpSpread1_Sheet1.Cells.Get(10, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(10, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(10, 1).Locked = true; - this.fpSpread1_Sheet1.Cells.Get(10, 1).RowSpan = 8; + this.fpSpread1_Sheet1.Cells.Get(10, 1).RowSpan = 10; this.fpSpread1_Sheet1.Cells.Get(10, 1).Value = " Other Job Portion"; this.fpSpread1_Sheet1.Cells.Get(10, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(10, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); - this.fpSpread1_Sheet1.Cells.Get(10, 2).Border = lineBorder6; + this.fpSpread1_Sheet1.Cells.Get(10, 2).Border = complexBorder1; generalCellType16.FormatString = "P"; generalCellType16.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType16.NumberFormat.PercentDecimalDigits = 1; @@ -683,6 +671,7 @@ this.fpSpread1_Sheet1.Cells.Get(10, 2).Value = "Project"; this.fpSpread1_Sheet1.Cells.Get(10, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(11, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(11, 1).Border = complexBorder1; generalCellType17.FormatString = "P"; generalCellType17.Multiline = true; generalCellType17.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -695,7 +684,7 @@ this.fpSpread1_Sheet1.Cells.Get(11, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(11, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(11, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); - this.fpSpread1_Sheet1.Cells.Get(11, 2).Border = lineBorder7; + this.fpSpread1_Sheet1.Cells.Get(11, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(11, 2).CellType = generalCellType16; this.fpSpread1_Sheet1.Cells.Get(11, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(11, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -704,6 +693,7 @@ this.fpSpread1_Sheet1.Cells.Get(11, 2).Value = "Training"; this.fpSpread1_Sheet1.Cells.Get(11, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(12, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(12, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(12, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(12, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(12, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -711,7 +701,7 @@ this.fpSpread1_Sheet1.Cells.Get(12, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(12, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(12, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); - this.fpSpread1_Sheet1.Cells.Get(12, 2).Border = lineBorder8; + this.fpSpread1_Sheet1.Cells.Get(12, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(12, 2).CellType = generalCellType16; this.fpSpread1_Sheet1.Cells.Get(12, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(12, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -720,6 +710,7 @@ this.fpSpread1_Sheet1.Cells.Get(12, 2).Value = "Overhaul"; this.fpSpread1_Sheet1.Cells.Get(12, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(13, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(13, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(13, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(13, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(13, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -727,7 +718,7 @@ this.fpSpread1_Sheet1.Cells.Get(13, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(13, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(13, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); - this.fpSpread1_Sheet1.Cells.Get(13, 2).Border = lineBorder9; + this.fpSpread1_Sheet1.Cells.Get(13, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(13, 2).CellType = generalCellType16; this.fpSpread1_Sheet1.Cells.Get(13, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(13, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -736,6 +727,7 @@ this.fpSpread1_Sheet1.Cells.Get(13, 2).Value = "Others"; this.fpSpread1_Sheet1.Cells.Get(13, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(14, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(14, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(14, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(14, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(14, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -743,7 +735,7 @@ this.fpSpread1_Sheet1.Cells.Get(14, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(14, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(14, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(14, 2).Border = lineBorder10; + this.fpSpread1_Sheet1.Cells.Get(14, 2).Border = complexBorder1; generalCellType18.FormatString = "P"; generalCellType18.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType18.NumberFormat.PercentDecimalDigits = 1; @@ -755,6 +747,7 @@ this.fpSpread1_Sheet1.Cells.Get(14, 2).Value = "Project"; this.fpSpread1_Sheet1.Cells.Get(14, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(15, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(15, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(15, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(15, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(15, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -762,7 +755,7 @@ this.fpSpread1_Sheet1.Cells.Get(15, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(15, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(15, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(15, 2).Border = lineBorder11; + this.fpSpread1_Sheet1.Cells.Get(15, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(15, 2).CellType = generalCellType18; this.fpSpread1_Sheet1.Cells.Get(15, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(15, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -771,6 +764,7 @@ this.fpSpread1_Sheet1.Cells.Get(15, 2).Value = "Training"; this.fpSpread1_Sheet1.Cells.Get(15, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(16, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(16, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(16, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(16, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(16, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -778,7 +772,7 @@ this.fpSpread1_Sheet1.Cells.Get(16, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(16, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(16, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(16, 2).Border = lineBorder12; + this.fpSpread1_Sheet1.Cells.Get(16, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(16, 2).CellType = generalCellType18; this.fpSpread1_Sheet1.Cells.Get(16, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(16, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -787,6 +781,7 @@ this.fpSpread1_Sheet1.Cells.Get(16, 2).Value = "Overhaul"; this.fpSpread1_Sheet1.Cells.Get(16, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(17, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(17, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(17, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(17, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(17, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -794,7 +789,7 @@ this.fpSpread1_Sheet1.Cells.Get(17, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(17, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(17, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(17, 2).Border = lineBorder13; + this.fpSpread1_Sheet1.Cells.Get(17, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(17, 2).CellType = generalCellType18; this.fpSpread1_Sheet1.Cells.Get(17, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(17, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -803,6 +798,7 @@ this.fpSpread1_Sheet1.Cells.Get(17, 2).Value = "Others"; this.fpSpread1_Sheet1.Cells.Get(17, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(18, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(18, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(18, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(18, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(18, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -810,7 +806,7 @@ this.fpSpread1_Sheet1.Cells.Get(18, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(18, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(18, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(18, 2).Border = lineBorder14; + this.fpSpread1_Sheet1.Cells.Get(18, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(18, 2).CellType = generalCellType18; this.fpSpread1_Sheet1.Cells.Get(18, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(18, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -819,6 +815,7 @@ this.fpSpread1_Sheet1.Cells.Get(18, 2).Value = "Others TTL"; this.fpSpread1_Sheet1.Cells.Get(18, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(19, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(236)))), ((int)(((byte)(247))))); + this.fpSpread1_Sheet1.Cells.Get(19, 1).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(19, 1).CellType = generalCellType17; this.fpSpread1_Sheet1.Cells.Get(19, 1).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(19, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -826,7 +823,7 @@ this.fpSpread1_Sheet1.Cells.Get(19, 1).Locked = true; this.fpSpread1_Sheet1.Cells.Get(19, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(19, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); - this.fpSpread1_Sheet1.Cells.Get(19, 2).Border = lineBorder15; + this.fpSpread1_Sheet1.Cells.Get(19, 2).Border = complexBorder1; this.fpSpread1_Sheet1.Cells.Get(19, 2).CellType = generalCellType18; this.fpSpread1_Sheet1.Cells.Get(19, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(19, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -835,7 +832,7 @@ this.fpSpread1_Sheet1.Cells.Get(19, 2).Value = "Others TTL (%)"; this.fpSpread1_Sheet1.Cells.Get(19, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(20, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(239)))), ((int)(((byte)(218))))); - this.fpSpread1_Sheet1.Cells.Get(20, 1).Border = complexBorder5; + this.fpSpread1_Sheet1.Cells.Get(20, 1).Border = complexBorder1; generalCellType19.FormatString = "P"; generalCellType19.Multiline = true; generalCellType19.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -850,7 +847,7 @@ this.fpSpread1_Sheet1.Cells.Get(20, 1).Value = "근무인원 (8hrs/p.s)"; this.fpSpread1_Sheet1.Cells.Get(20, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(20, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(226)))), ((int)(((byte)(239)))), ((int)(((byte)(218))))); - this.fpSpread1_Sheet1.Cells.Get(20, 2).Border = complexBorder6; + this.fpSpread1_Sheet1.Cells.Get(20, 2).Border = complexBorder1; generalCellType20.FormatString = "P"; generalCellType20.Multiline = true; generalCellType20.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -862,8 +859,15 @@ this.fpSpread1_Sheet1.Cells.Get(20, 2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(20, 2).Locked = true; this.fpSpread1_Sheet1.Cells.Get(20, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(21, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(206)))), ((int)(((byte)(170))))); + this.fpSpread1_Sheet1.Cells.Get(21, 1).Border = complexBorder1; + this.fpSpread1_Sheet1.Cells.Get(21, 1).ColumnSpan = 2; + this.fpSpread1_Sheet1.Cells.Get(21, 1).Font = new System.Drawing.Font("맑은 고딕", 11F, System.Drawing.FontStyle.Bold); + this.fpSpread1_Sheet1.Cells.Get(21, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Cells.Get(21, 1).Value = "TTL Working Utilization(%)"; + this.fpSpread1_Sheet1.Cells.Get(21, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(21, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(237)))), ((int)(((byte)(171))))); - this.fpSpread1_Sheet1.Cells.Get(21, 2).Border = lineBorder16; + this.fpSpread1_Sheet1.Cells.Get(21, 2).Border = complexBorder1; generalCellType21.FormatString = "P"; generalCellType21.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType21.NumberFormat.PercentDecimalDigits = 1; @@ -875,7 +879,7 @@ this.fpSpread1_Sheet1.Cells.Get(21, 2).Value = "TTL Working Utilization(%)"; this.fpSpread1_Sheet1.Cells.Get(21, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(22, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(22, 1).Border = complexBorder7; + this.fpSpread1_Sheet1.Cells.Get(22, 1).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(22, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(22, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(22, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -883,7 +887,7 @@ this.fpSpread1_Sheet1.Cells.Get(22, 1).Value = "Weekly"; this.fpSpread1_Sheet1.Cells.Get(22, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(22, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(22, 2).Border = complexBorder7; + this.fpSpread1_Sheet1.Cells.Get(22, 2).Border = complexBorder2; this.fpSpread1_Sheet1.Cells.Get(22, 2).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(22, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(22, 2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; @@ -891,19 +895,19 @@ this.fpSpread1_Sheet1.Cells.Get(22, 2).Value = "Weekly"; this.fpSpread1_Sheet1.Cells.Get(22, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(23, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(23, 1).Border = lineBorder17; + this.fpSpread1_Sheet1.Cells.Get(23, 1).Border = lineBorder1; this.fpSpread1_Sheet1.Cells.Get(23, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(23, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(23, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(23, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(23, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(117)))), ((int)(((byte)(181))))); - this.fpSpread1_Sheet1.Cells.Get(23, 2).Border = lineBorder18; + this.fpSpread1_Sheet1.Cells.Get(23, 2).Border = lineBorder2; this.fpSpread1_Sheet1.Cells.Get(23, 2).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(23, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1_Sheet1.Cells.Get(23, 2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(23, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(24, 1).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(24, 1).Border = complexBorder8; + this.fpSpread1_Sheet1.Cells.Get(24, 1).Border = complexBorder3; generalCellType22.FormatString = "\"건\""; generalCellType22.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType22.NumberFormat.CurrencyDecimalDigits = 2; @@ -918,7 +922,7 @@ this.fpSpread1_Sheet1.Cells.Get(24, 1).Value = "Summary"; this.fpSpread1_Sheet1.Cells.Get(24, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(24, 2).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(24, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(24, 2).Border = complexBorder4; generalCellType23.FormatString = "\"건\""; generalCellType23.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType23.NumberFormat.CurrencyDecimalDigits = 2; @@ -932,7 +936,7 @@ this.fpSpread1_Sheet1.Cells.Get(24, 2).Value = "건수"; this.fpSpread1_Sheet1.Cells.Get(24, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(25, 1).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(25, 1).Border = lineBorder19; + this.fpSpread1_Sheet1.Cells.Get(25, 1).Border = lineBorder3; generalCellType24.FormatString = "\"건\""; generalCellType24.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType24.NumberFormat.CurrencyDecimalDigits = 2; @@ -945,7 +949,7 @@ this.fpSpread1_Sheet1.Cells.Get(25, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(25, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(25, 2).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(25, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(25, 2).Border = complexBorder4; generalCellType25.FormatString = "\"건\""; generalCellType25.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType25.NumberFormat.CurrencyDecimalDigits = 2; @@ -959,14 +963,14 @@ this.fpSpread1_Sheet1.Cells.Get(25, 2).Value = "Hrs"; this.fpSpread1_Sheet1.Cells.Get(25, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(26, 1).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(26, 1).Border = lineBorder20; + this.fpSpread1_Sheet1.Cells.Get(26, 1).Border = lineBorder4; this.fpSpread1_Sheet1.Cells.Get(26, 1).CellType = generalCellType24; this.fpSpread1_Sheet1.Cells.Get(26, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(26, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(26, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(26, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(26, 2).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(26, 2).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(26, 2).Border = complexBorder4; this.fpSpread1_Sheet1.Cells.Get(26, 2).CellType = generalCellType25; this.fpSpread1_Sheet1.Cells.Get(26, 2).Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.fpSpread1_Sheet1.Cells.Get(26, 2).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -974,14 +978,14 @@ this.fpSpread1_Sheet1.Cells.Get(26, 2).Value = "Completed"; this.fpSpread1_Sheet1.Cells.Get(26, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(27, 1).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(27, 1).Border = complexBorder2; + this.fpSpread1_Sheet1.Cells.Get(27, 1).Border = complexBorder4; this.fpSpread1_Sheet1.Cells.Get(27, 1).CellType = generalCellType23; this.fpSpread1_Sheet1.Cells.Get(27, 1).Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Cells.Get(27, 1).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.Cells.Get(27, 1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(27, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(27, 2).BackColor = System.Drawing.SystemColors.Window; - this.fpSpread1_Sheet1.Cells.Get(27, 2).Border = complexBorder3; + this.fpSpread1_Sheet1.Cells.Get(27, 2).Border = complexBorder5; generalCellType26.FormatString = "P"; generalCellType26.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); generalCellType26.NumberFormat.PercentDecimalDigits = 1; @@ -993,7 +997,7 @@ this.fpSpread1_Sheet1.Cells.Get(27, 2).Value = "On-going"; this.fpSpread1_Sheet1.Cells.Get(27, 2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(28, 1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(198)))), ((int)(((byte)(224)))), ((int)(((byte)(180))))); - this.fpSpread1_Sheet1.Cells.Get(28, 1).Border = lineBorder21; + this.fpSpread1_Sheet1.Cells.Get(28, 1).Border = lineBorder5; generalCellType27.FormatString = "P"; generalCellType27.Multiline = true; generalCellType27.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -1007,7 +1011,7 @@ this.fpSpread1_Sheet1.Cells.Get(28, 1).Value = "Year Target "; this.fpSpread1_Sheet1.Cells.Get(28, 1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Cells.Get(28, 2).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(198)))), ((int)(((byte)(224)))), ((int)(((byte)(180))))); - this.fpSpread1_Sheet1.Cells.Get(28, 2).Border = lineBorder22; + this.fpSpread1_Sheet1.Cells.Get(28, 2).Border = lineBorder6; generalCellType28.FormatString = " #,##0 ;\\- #,##0 ; \"-\" "; generalCellType28.Multiline = true; generalCellType28.NumberFormat = ((System.Globalization.NumberFormatInfo)(new System.Globalization.CultureInfo("ko-KR", false).NumberFormat.Clone())); @@ -1063,6 +1067,7 @@ this.fpSpread1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.fpSpread1_Sheet1.DefaultStyle.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.General; this.fpSpread1_Sheet1.DefaultStyle.Locked = true; + this.fpSpread1_Sheet1.DefaultStyle.Parent = "DataAreaDefault"; this.fpSpread1_Sheet1.DefaultStyle.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DrawingContainer.ContainedObjects.AddRange(new object[] { this.fpSpread1_Sheet1_SpreadChart1}); @@ -1102,16 +1107,22 @@ this.fpSpread1_Sheet1.Rows.Get(0).Height = 1F; this.fpSpread1_Sheet1.Rows.Get(1).Height = 42F; this.fpSpread1_Sheet1.Rows.Get(2).Height = 12F; - this.fpSpread1_Sheet1.Rows.Get(10).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(11).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(12).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(13).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(14).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(15).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(16).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(17).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(18).Height = 18F; - this.fpSpread1_Sheet1.Rows.Get(19).Height = 18F; + this.fpSpread1_Sheet1.Rows.Get(5).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(6).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(7).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(8).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(9).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(10).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(11).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(12).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(13).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(14).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(15).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(16).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(17).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(18).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(19).Height = 30F; + this.fpSpread1_Sheet1.Rows.Get(20).Height = 30F; this.fpSpread1_Sheet1.Rows.Get(21).Height = 50F; this.fpSpread1_Sheet1.Rows.Get(22).Height = 50F; this.fpSpread1_Sheet1.Rows.Get(22).Visible = false; @@ -1135,7 +1146,6 @@ this.fpSpread1_Sheet1.Rows.Get(31).Visible = false; this.fpSpread1_Sheet1.Rows.Get(32).Height = 50F; this.fpSpread1_Sheet1.VerticalGridLine = new FarPoint.Win.Spread.GridLine(FarPoint.Win.Spread.GridLineType.Flat, System.Drawing.Color.Empty); - this.fpSpread1_Sheet1.ZoomFactor = 0.8F; // // fpSpread1_Sheet1_SpreadChart1 // @@ -1305,7 +1315,7 @@ ((System.ComponentModel.ISupportInitialize)(yPlotArea1)).EndInit(); this.fpSpread1_Sheet1_SpreadChart1.Model.PlotAreas.AddRange(new FarPoint.Win.Chart.PlotArea[] { yPlotArea1}); - this.fpSpread1_Sheet1_SpreadChart1.Rectangle = new System.Drawing.Rectangle(49, 525, 3475, 601); + this.fpSpread1_Sheet1_SpreadChart1.Rectangle = new System.Drawing.Rectangle(39, 661, 870, 374); this.fpSpread1_Sheet1_SpreadChart1.ShapeOutlineColor = System.Drawing.Color.White; this.fpSpread1_Sheet1_SpreadChart1.ShapeOutlineThickness = 0F; this.fpSpread1_Sheet1_SpreadChart1.SheetName = "fpSpread1_Sheet1"; @@ -1319,7 +1329,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1191, 676); + this.ClientSize = new System.Drawing.Size(1191, 708); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.panel1); diff --git a/SubProject/FPJ0000/JobReport_/K5Dailyform.cs b/SubProject/FPJ0000/JobReport_/K5Dailyform.cs index 6465ba9..8f6deb9 100644 --- a/SubProject/FPJ0000/JobReport_/K5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/K5Dailyform.cs @@ -46,7 +46,7 @@ namespace FPJ0000.JobReport_ //if (this.fpSpread1.Sheets.Count > 1) this.fpSpread1.ActiveSheetIndex = 0; //refrehData(); - makedata(); + //makedata(); binit = true; } @@ -263,7 +263,7 @@ namespace FPJ0000.JobReport_ this.progressBar1.Value = 0; - + //자료를 불러온다 @@ -287,7 +287,7 @@ namespace FPJ0000.JobReport_ foreach (var item in rawdata) { sheet.Cells[3, col].Value = item.First().ww; - sheet.Cells[4,col].Value = item.Key.Substring(8,2); + sheet.Cells[4, col].Value = item.Key.Substring(8, 2); col += 1; } @@ -296,11 +296,17 @@ namespace FPJ0000.JobReport_ //날짜별로 묶음처리한다. //var grplist = rawdata.GroupBy(t => t.pdate); + ComplexBorderSide left = new ComplexBorderSide(Color.Gray, 1); + ComplexBorderSide top = new ComplexBorderSide(Color.Gray, 1); + ComplexBorderSide right = new ComplexBorderSide(Color.Gray, 1); + ComplexBorderSide bottom = new ComplexBorderSide(Color.Gray, 1); + + col = 3; foreach (var item in rawdata) { - + var row = 5; this.progressBar1.Value += 1; var drDate = item.FirstOrDefault(); @@ -309,245 +315,262 @@ namespace FPJ0000.JobReport_ var 근무인원 = item.GroupBy(t => t.id).Count(); //완료 - var newdr = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr.Grp = "1.Tech. Support Summary"; - newdr.Item = "1.Completed"; - newdr.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr.Format = "N0"; - newdr.Sign = string.Empty; - newdr.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr.value = item.Where(t => t.svalue == "Technical Support" && t.status == "진행 완료").Count(); - newdr.graph = true; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr); + //var newdr = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr.Grp = "1.Tech. Support Summary"; + //newdr.Item = "1.Completed"; + //newdr.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr.Format = "N0"; + //newdr.Sign = string.Empty; + //newdr.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr.value = item.Where(t => t.svalue == "Technical Support" && t.status == "진행 완료").Count(); + //newdr.graph = true; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr); sheet.Cells[row++, col].Value = item.Where(t => t.svalue == "Technical Support" && t.status == "진행 완료").Count(); // item.First().ww; - + //진행중 - var newdr2 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr2.Grp = "1.Tech. Support Summary"; - newdr2.Item = "2.On-going"; - newdr2.Format = "N0"; - newdr2.Sign = string.Empty; - newdr2.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr2.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count(); - newdr2.graph = true; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr2); + //var newdr2 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr2.Grp = "1.Tech. Support Summary"; + //newdr2.Item = "2.On-going"; + //newdr2.Format = "N0"; + //newdr2.Sign = string.Empty; + //newdr2.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr2.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count(); + //newdr2.graph = true; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr2); sheet.Cells[row++, col].Value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count(); //건수 - var newdr3 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr3.Grp = "1.Tech. Support Summary"; - newdr3.Item = "3.건수"; - newdr3.Format = "N0"; - newdr3.Sign = string.Empty; - newdr3.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr3.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr3.value = item.Where(t => t.svalue == "Technical Support").Count(); - newdr3.graph = true; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr3); + //var newdr3 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr3.Grp = "1.Tech. Support Summary"; + //newdr3.Item = "3.건수"; + //newdr3.Format = "N0"; + //newdr3.Sign = string.Empty; + //newdr3.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr3.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr3.value = item.Where(t => t.svalue == "Technical Support").Count(); + //newdr3.graph = true; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr3); sheet.Cells[row++, col].Value = item.Where(t => t.svalue == "Technical Support").Count(); //hrs - var newdr4 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr4.Grp = "1.Tech. Support Summary"; - newdr4.Item = "4.Hrs"; - newdr4.Format = "N0"; - newdr4.Sign = string.Empty; - newdr4.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr4.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr4.value = (double)(item.Where(t => t.svalue == "Technical Support").Sum(t => t.hrs)); - newdr4.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr4); + //var newdr4 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr4.Grp = "1.Tech. Support Summary"; + //newdr4.Item = "4.Hrs"; + //newdr4.Format = "N0"; + //newdr4.Sign = string.Empty; + //newdr4.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr4.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + var newdr4value = (double)(item.Where(t => t.svalue == "Technical Support").Sum(t => t.hrs)); + //newdr4.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr4); sheet.Cells[row++, col].Value = (double)(item.Where(t => t.svalue == "Technical Support").Sum(t => t.hrs)); //요약 - var newdr4a = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr4a.Grp = "1.Tech. Support Summary"; - newdr4a.Item = "5.Technical Support"; - newdr4a.Format = "N1"; - newdr4a.Sign = "%"; - newdr4a.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr4a.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr4a.value = Math.Round( (newdr4.value / (근무인원 * 8.0)) * 100.0,2); - newdr4a.graph = true; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr4a); - sheet.Cells[row++, col].Value = Math.Round((newdr4.value / (근무인원 * 8.0)) * 100.0,3); + //var newdr4a = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr4a.Grp = "1.Tech. Support Summary"; + //newdr4a.Item = "5.Technical Support"; + //newdr4a.Format = "N1"; + //newdr4a.Sign = "%"; + //newdr4a.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr4a.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr4a.value = Math.Round((newdr4value / (근무인원 * 8.0)) * 100.0, 2); + //newdr4a.graph = true; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr4a); + sheet.Cells[row++, col].Value = Math.Round((newdr4value / (근무인원 * 8.0)) * 100.0, 3); //Other Job Portion - var newdr5 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr5.Grp = "2.Other Job Portion"; - newdr5.Item = "1.Project"; - newdr5.Format = "N0"; - newdr5.Sign = string.Empty; - newdr5.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr5.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr5.value = (double)(item.Where(t => t.svalue == "Project").Sum(t => t.hrs)); - newdr5.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr5); + //var newdr5 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr5.Grp = "2.Other Job Portion"; + //newdr5.Item = "1.Project"; + //newdr5.Format = "N0"; + //newdr5.Sign = string.Empty; + //newdr5.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr5.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + var newdr5value = (double)(item.Where(t => t.svalue == "Project").Sum(t => t.hrs)); + //newdr5.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr5); sheet.Cells[row++, col].Value = (double)(item.Where(t => t.svalue == "Project").Sum(t => t.hrs)); //Other Job Portion - var newdr6 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr6.Grp = "2.Other Job Portion"; - newdr6.Item = "2.Training"; - newdr6.Format = "N0"; - newdr6.Sign = string.Empty; - newdr6.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr6.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr6.value = (double)(item.Where(t => t.svalue == "Training").Sum(t => t.hrs)); - newdr6.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr6); + //var newdr6 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr6.Grp = "2.Other Job Portion"; + //newdr6.Item = "2.Training"; + //newdr6.Format = "N0"; + //newdr6.Sign = string.Empty; + //newdr6.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr6.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + var newdr6value = (double)(item.Where(t => t.svalue == "Training").Sum(t => t.hrs)); + //newdr6.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr6); sheet.Cells[row++, col].Value = (double)(item.Where(t => t.svalue == "Training").Sum(t => t.hrs)); //Overhaul - var newdr7 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr7.Grp = "2.Other Job Portion"; - newdr7.Item = "3.Overhaul"; - newdr7.Format = "N0"; - newdr7.Sign = string.Empty; - newdr7.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr7.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr7.value = (double)(item.Where(t => t.svalue == "Overhaul").Sum(t => t.hrs)); - newdr7.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr7); + //var newdr7 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr7.Grp = "2.Other Job Portion"; + //newdr7.Item = "3.Overhaul"; + //newdr7.Format = "N0"; + //newdr7.Sign = string.Empty; + //newdr7.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr7.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + var newdr7value = (double)(item.Where(t => t.svalue == "Overhaul").Sum(t => t.hrs)); + //newdr7.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr7); sheet.Cells[row++, col].Value = (double)(item.Where(t => t.svalue == "Overhaul").Sum(t => t.hrs)); //Others - var newdr8 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr8.Grp = "2.Other Job Portion"; - newdr8.Item = "4.Others"; - newdr8.Format = "N0"; - newdr8.Sign = string.Empty; - newdr8.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr8.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr8.value = (double)(item.Where(t => t.svalue != "Project" && t.svalue != "Training" && t.svalue != "Overhaul" ).Sum(t => t.hrs)); - newdr8.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr8); + //var newdr8 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr8.Grp = "2.Other Job Portion"; + //newdr8.Item = "4.Others"; + //newdr8.Format = "N0"; + //newdr8.Sign = string.Empty; + //newdr8.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr8.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + var newdr8value = (double)(item.Where(t => t.svalue != "Project" && t.svalue != "Training" && t.svalue != "Overhaul").Sum(t => t.hrs)); + //newdr8.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr8); sheet.Cells[row++, col].Value = (double)(item.Where(t => t.svalue == "Others").Sum(t => t.hrs)); //Other Job Portion - var newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "5.Project"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = (newdr5.value / (근무인원 * 8)) * 100.0; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = Math.Round((newdr5.value / (근무인원 * 8)) * 100.0, 3); + //var newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "5.Project"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = (newdr5value / (근무인원 * 8)) * 100.0; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = Math.Round((newdr5value / (근무인원 * 8)) * 100.0, 3); //Other Job Portion - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "6.Training"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = (newdr6.value / (근무인원 * 8)) * 100.0; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = Math.Round((newdr6.value / (근무인원 * 8)) * 100.0, 3); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "6.Training"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = (newdr6.value / (근무인원 * 8)) * 100.0; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = Math.Round((newdr6value / (근무인원 * 8)) * 100.0, 3); //Overhaul - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "7.Overhaul"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = (newdr7.value / (근무인원 * 8)) * 100.0; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = Math.Round((newdr7.value / (근무인원 * 8)) * 100.0, 3); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "7.Overhaul"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = (newdr7.value / (근무인원 * 8)) * 100.0; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = Math.Round((newdr7value / (근무인원 * 8)) * 100.0, 3); //Others - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "8.Others"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = (newdr8.value / (근무인원 * 8)) * 100.0; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = Math.Round((newdr8.value / (근무인원 * 8)) * 100.0, 3); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "8.Others"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = (newdr8.value / (근무인원 * 8)) * 100.0; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = Math.Round((newdr8value / (근무인원 * 8)) * 100.0, 3); //Others TTL - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "9.Others TTL"; - newdr10.Format = "N0"; - newdr10.Sign = ""; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = newdr5.value + newdr6.value + newdr7.value + newdr8.value; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = newdr5.value + newdr6.value + newdr7.value + newdr8.value; + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "9.Others TTL"; + //newdr10.Format = "N0"; + //newdr10.Sign = ""; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = newdr5.value + newdr6.value + newdr7.value + newdr8.value; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = newdr5value + newdr6value + newdr7value + newdr8value; //Others TTL (%) - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "2.Other Job Portion"; - newdr10.Item = "9.Others TTL(%)"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = (newdr5.value / (근무인원 * 8) + newdr6.value / (근무인원 * 8) + newdr7.value / (근무인원 * 8) + newdr8.value / (근무인원 * 8)) * 100.0; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); - sheet.Cells[row++, col].Value = Math.Round((newdr5.value / (근무인원 * 8) + newdr6.value / (근무인원 * 8) + newdr7.value / (근무인원 * 8) + newdr8.value / (근무인원 * 8)) * 100.0, 3); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "2.Other Job Portion"; + //newdr10.Item = "9.Others TTL(%)"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = (newdr5.value / (근무인원 * 8) + newdr6.value / (근무인원 * 8) + newdr7.value / (근무인원 * 8) + newdr8.value / (근무인원 * 8)) * 100.0; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + sheet.Cells[row++, col].Value = Math.Round((newdr5value / (근무인원 * 8) + newdr6value / (근무인원 * 8) + newdr7value / (근무인원 * 8) + newdr8value / (근무인원 * 8)) * 100.0, 3); //3.근무인원 - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "3.근무인원"; - newdr10.Item = "1.(8hrs/p.s)"; - newdr10.Format = "N0"; - newdr10.Sign = ""; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = 근무인원; - newdr10.graph = false; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "3.근무인원"; + //newdr10.Item = "1.(8hrs/p.s)"; + //newdr10.Format = "N0"; + //newdr10.Sign = ""; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = 근무인원; + //newdr10.graph = false; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); sheet.Cells[row++, col].Value = 근무인원; //3.근무인원 - var v1 = (newdr4.value / (근무인원 * 8.0)) * 100.0; - var v2 = (newdr5.value / (근무인원 * 8) + newdr6.value / (근무인원 * 8) + newdr7.value / (근무인원 * 8) + newdr8.value / (근무인원 * 8)) * 100.0; + var v1 = (newdr4value / (근무인원 * 8.0)) * 100.0; + var v2 = (newdr5value / (근무인원 * 8) + newdr6value / (근무인원 * 8) + newdr7value / (근무인원 * 8) + newdr8value / (근무인원 * 8)) * 100.0; - newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); - newdr10.Grp = "4.TTL"; - newdr10.Item = "1.Working Utilization(%)"; - newdr10.Format = "N1"; - newdr10.Sign = "%"; - newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); - newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr10.value = v1 + v2; - newdr10.graph = true; - dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); + //newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow(); + //newdr10.Grp = "4.TTL"; + //newdr10.Item = "1.Working Utilization(%)"; + //newdr10.Format = "N1"; + //newdr10.Sign = "%"; + //newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); + //newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); + //newdr10.value = v1 + v2; + //newdr10.graph = true; + //dsReport.K5DailyForm.AddK5DailyFormRow(newdr10); sheet.Cells[row++, col].Value = Math.Round(v1 + v2, 3); col += 1; } + + //중앙정렬 및 테두리 작업 + this.progressBar1.Maximum = sheet.RowCount * sheet.ColumnCount; + this.progressBar1.Value = 0; + sheet.AutoCalculation = false; + for (int row = 0; row < sheet.RowCount; row++) + { + for (int c = 0; c < sheet.ColumnCount; c++) + { + this.progressBar1.Value += 1; + sheet.Cells[row, c].Border = new ComplexBorder(left, top, right, bottom); + sheet.Cells[row, c].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + sheet.Cells[row, c].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + Application.DoEvents(); + } + } + sheet.AutoCalculation = true; //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal); //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; //this.reportViewer1.RefreshReport(); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs index 739ac41..265e477 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs @@ -30,20 +30,20 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -107,7 +107,7 @@ this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.wFDailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.btImport = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -148,15 +148,16 @@ this.btReportDay, this.toolStripButton1, this.toolStripButton3, - this.toolStripButton5}); - this.bn.Location = new System.Drawing.Point(0, 664); + this.toolStripButton5, + this.btImport}); + this.bn.Location = new System.Drawing.Point(0, 730); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(1280, 25); + this.bn.Size = new System.Drawing.Size(1364, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -356,8 +357,7 @@ // this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton5.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.k5DailyFormToolStripMenuItem, - this.wFDailToolStripMenuItem}); + this.k5DailyFormToolStripMenuItem}); this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton5.Name = "toolStripButton5"; @@ -368,7 +368,7 @@ // k5DailyFormToolStripMenuItem // this.k5DailyFormToolStripMenuItem.Name = "k5DailyFormToolStripMenuItem"; - this.k5DailyFormToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.k5DailyFormToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.k5DailyFormToolStripMenuItem.Text = "K5 DailyForm"; this.k5DailyFormToolStripMenuItem.Click += new System.EventHandler(this.k5DailyFormToolStripMenuItem_Click); // @@ -524,7 +524,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1280, 567); + this.fpSpread1.Size = new System.Drawing.Size(1364, 633); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -553,82 +553,82 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "#"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType26; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType27; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지"; this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType28; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName"; this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs"; this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F; - numberCellType3.MaximumValue = 999999999999999D; - numberCellType3.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3; + numberCellType9.MaximumValue = 999999999999999D; + numberCellType9.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot"; this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType32; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType33; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "#"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -657,7 +657,7 @@ this.toolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1280, 37); + this.toolStrip1.Size = new System.Drawing.Size(1364, 37); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -786,25 +786,28 @@ this.richTextBox1.BackColor = System.Drawing.Color.Gainsboro; this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true)); this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.richTextBox1.Location = new System.Drawing.Point(0, 604); + this.richTextBox1.Location = new System.Drawing.Point(0, 670); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(1280, 60); + this.richTextBox1.Size = new System.Drawing.Size(1364, 60); this.richTextBox1.TabIndex = 5; this.richTextBox1.Text = ""; // - // wFDailToolStripMenuItem + // btImport // - this.wFDailToolStripMenuItem.Name = "wFDailToolStripMenuItem"; - this.wFDailToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.wFDailToolStripMenuItem.Text = "WF Dail"; - this.wFDailToolStripMenuItem.Click += new System.EventHandler(this.wFDailToolStripMenuItem_Click); + this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image"))); + this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btImport.Name = "btImport"; + this.btImport.Size = new System.Drawing.Size(23, 22); + this.btImport.Text = "가져오기"; + this.btImport.Click += new System.EventHandler(this.btImport_Click); // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1280, 689); + this.ClientSize = new System.Drawing.Size(1364, 755); this.Controls.Add(this.fpSpread1); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.toolStrip1); @@ -893,6 +896,6 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripDropDownButton toolStripButton5; private System.Windows.Forms.ToolStripMenuItem k5DailyFormToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem wFDailToolStripMenuItem; + private System.Windows.Forms.ToolStripButton btImport; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index 32e6be5..b6f38b6 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -673,5 +673,10 @@ namespace FPJ0000 var f2 = new JobReport_.K5Dailyform(); f2.Show(); } + + private void btImport_Click(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.resx b/SubProject/FPJ0000/JobReport_/fJobReport.resx index 67249ce..44d7836 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport.resx @@ -260,22 +260,37 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVDhPhZNZTxNRGIZ7pT/BoBdemrhAtEZxSRQELEsC - LggEUQqlEBCQQA1EEVNQWcSABEjUEIjGCzXEBQpYQEoptKEYEUTAsi/KUoG20ykzLa9npg3FhMQveXIu - zvmenO+dMwKu/O+oYkNKtMrQR9o/IUVaK1lpnlJu1dGhJT10UJFm8JRMXb4//PUOvmlrBd7vUi+a6OWl - NcputNhgNLtZNnHQ+DFvQu6HacSVD1OiVMVOV6uzggs1iytm2t4zyUA3xUI3zUI7yUIzsQ7VTxuahyyw - sUDDsBW576YQ/2TY+o8k8IHaukato2/Gji8zLFlZ9PKSdXQabPg0RBGBA33zdujmGBQopuGb0/6Kb44s - 9Rm/UhS+Ia26hPjKy6hsqUN+fSl88zzhQxAVnIS//BjKGsr4Ucw0i4UVCv63O1leEFHi+7Z9oBGNo89R - qc3iJdcrgpD1MgZpdVGQVIchrjoODf0LaBw04+O3NaySnALkXTQvEJWLdoYVptu1Ix14MSBHsSqVl8RW - BZPmC0h6mgi1wcKP0jZqhZLksGJhEJDf7RRwFVjYSWfUiKE3aFCtu4WHrZmILD2H2Ipw6Ccp6EmwXMDq - MWcmRiLwl28RnLmbxxzP3ouYchH6xnpQ0JEMuSIDUY/9UKd6j6+zLPQk2J4JBt2ERRMD33suwRGZh1Qo - 24O02mhcrQpEdNl5XpKhiIGsPpHcxA/cft+0Hb3cJyaYSJCnczROgVC2a1Yo200OeUCY5YGLxX5IeSaG - ekiJAmU2kt+IIamKgJ4IdORtaImAZhzwzlS5Rzib00XPr9Lon7XzdI7M4WZNEhJIo7Q6Cpm1Nzb3OKh1 - O4TprW7BCZmKnjG6Bf/DQkbwSmx2C7wzPlOG36aN7Q5vB2VjHIfECrOrnQSZ1Dr+a40yGRYsjvElK8YX - rTC4WDIzPFzy5HcBefIOhmVX911r+u5qFwiOJrWkeEmaWw9LlUYvaRO9SYITzwSFE4mCPiBpWjkY19Tm - KVbECwQCwV8VL6KkvF4YKgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL6SURBVDhPhZLbT9NgGMZ3pX+CQS+8NBqF4IwavVAmh4HG + MwpBZMAYBARdYB4SFTOmqIiCBJaoMRKNF2qMhzHUATLGZIvDeJyKiMjJgM6NdW23tvPxa7cwTEh8k1++ + i6/PL32fViZOynGrakudw7LtguN3Rq2DIScrUS+eTnZbXR+bcc7+fr3O1rgs8848KTR70k/32qb87K9J + LyV4AkF4qBi//CIsPk74ceLRCFSXPtHKcvP8aDQym8/apzzTtNA3zMH5nYdzhIdjmIf9WwjWL0E8cQcQ + 5AHTJwYnHnxH4WU3848kzWBlpukQ+kcFvBrlycnjpSQJoWcwiGdumgjC6J8Q4BznYDCPQHGs67YUzqpP + GtpTm/lH07ILhc270fy0FTX366GojkcSQWlYhxT9ajSYGqRVKJbHpJdGyrEeXhLsrVPc63rXhraBa2h2 + VEmSvKYMVN3KRUVrNtTG7SgwFsD0ZhJt7yk8fjsNH+kpVd/LSgJlo3L+1jMHBcfnbtx8p8d5a7kkUbVs + JuEdKLlSDNtgQFqlc4CBhfTgDXBIrXkREYiTfraH1V7Ph2vQDqPzMGo7KpFVvwmqpky4hmm4SLFiwbav + kU48RJCinyXYcLKaW3N0MXIblej/2gdDdyn0Zi2yLyaj1foQr8d4uEixfd84vCBM+TkoTkUFK3VxGrlu + ESpu5GBfSzpyGtIkidacC939YvImyRDv+0cEvBQ/McFPilx3xB4RyHULxuS6heShOMir4rDzfDLKrubD + 5rbAYDmK0rv5ULfshYsInOTfcBABy4WxWmuNrbDxSC874WPxZkyQ6Pk8jkPXS1BEghpjNipvHJi5E6FD + AhIPPosJ1lRa2VFPTPA/AmSFhGJzTLBW+5wemPD9mevhuaCYYHhFnomKxkmRJR1D49O0f+CHPzz0k8HQ + FIPBKD8pTkJsnmIFeCk2HAyFfEv2t3+IxmWyVSVPyxLUTzoSNRZPgqaNnaEoQnyRKYLaxC5Vt3uXF7R3 + xuebC2UymewvcCKiNqMNhYIAAAAASUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE8SURBVDhPnZI/S0JRGIf9Oo19ARdziDZBGmwRx5amFsG5 + BolahJbWmkKwKYQ2BZGISohABIWCjJDsgmj3xHPivfc99yCCB56r98/vOed9z0mZNUZKDx48vU1N42Fg + uez0zfldz3J03bYc1hoOjoQbgkhG4x/zMQkceKY5vh2b3YPTWCICPm4NQ49m/zfiMwitwJFwYdnfwcwL + l06yngD4NlcsxwLqTQoIa8HNyyJipYDgWbcQSQT6dPU49wV0WgTF6pap1AtWoEEwnISRYDu/7wtYalLA + f9ACdsMRsLfsgtSLhDC/ugQEF/f/gszO3nIBjZIwIaA8wjB4/1oukE6zVAQ6WOssLAjS2bwrkB5ogZAU + MJkj4FQ9v46shJf66AIzCrzn5G5sZmIBK0AisMdAp4F6BWYm7JyD9Ycxf8jQQxybOGd5AAAAAElFTkSu + QmCC + + + + 17, 17 + 325, 17 diff --git a/SubProject/FPJ0000/JobReport_/fJobReportImport.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReportImport.Designer.cs index 3eace7a..706490f 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReportImport.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReportImport.Designer.cs @@ -36,14 +36,7 @@ this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.button3 = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); - this.label7 = new System.Windows.Forms.Label(); this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); - this.label6 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.nudCE = new System.Windows.Forms.NumericUpDown(); - this.nudCS = new System.Windows.Forms.NumericUpDown(); - this.label5 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.nudE = new System.Windows.Forms.NumericUpDown(); this.nudS = new System.Windows.Forms.NumericUpDown(); @@ -64,20 +57,85 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar(); - this.sd = new System.Windows.Forms.DateTimePicker(); - this.ed = new System.Windows.Forms.DateTimePicker(); - this.cmbUser = new System.Windows.Forms.ComboBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); + this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); + this.label14 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); + this.nuddate = new System.Windows.Forms.NumericUpDown(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.nudreq = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.nudpack = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.nudst = new System.Windows.Forms.NumericUpDown(); + this.label13 = new System.Windows.Forms.Label(); + this.nudtype = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.nudbunru = new System.Windows.Forms.NumericUpDown(); + this.label16 = new System.Windows.Forms.Label(); + this.nuditem = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); + this.nudbio = new System.Windows.Forms.NumericUpDown(); + this.nudhrd = new System.Windows.Forms.NumericUpDown(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.nudot = new System.Windows.Forms.NumericUpDown(); + this.label20 = new System.Windows.Forms.Label(); + this.nuduid = new System.Windows.Forms.NumericUpDown(); + this.label21 = new System.Windows.Forms.Label(); + this.nudname = new System.Windows.Forms.NumericUpDown(); + this.dsPRJ = new FPJ0000.dsPRJ(); + this.jobReportTableAdapter = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); + this.idxDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.hrsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wuidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.usernameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pidxDataGridViewTextBoxColumn = 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.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.importDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.weekDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.processDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.gcodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.description2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.tagDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCE)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCS)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudE)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudS)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nuddate)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudreq)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudpack)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudst)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudtype)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudbunru)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nuditem)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudbio)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudhrd)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudot)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nuduid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudname)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); this.SuspendLayout(); // // textBox1 @@ -111,12 +169,38 @@ // dataGridView1 // this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AutoGenerateColumns = false; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idxDataGridViewTextBoxColumn, + this.pdateDataGridViewTextBoxColumn, + this.uidDataGridViewTextBoxColumn, + this.typeDataGridViewTextBoxColumn, + this.hrsDataGridViewTextBoxColumn, + this.wuidDataGridViewTextBoxColumn, + this.wdateDataGridViewTextBoxColumn, + this.usernameDataGridViewTextBoxColumn, + this.pidxDataGridViewTextBoxColumn, + this.requestpartDataGridViewTextBoxColumn, + this.packageDataGridViewTextBoxColumn, + this.statusDataGridViewTextBoxColumn, + this.descriptionDataGridViewTextBoxColumn, + this.remarkDataGridViewTextBoxColumn, + this.importDataGridViewCheckBoxColumn, + this.projectNameDataGridViewTextBoxColumn, + this.weekDataGridViewTextBoxColumn, + this.otDataGridViewTextBoxColumn, + this.wwDataGridViewTextBoxColumn, + this.processDataGridViewTextBoxColumn, + this.gcodeDataGridViewTextBoxColumn, + this.description2DataGridViewTextBoxColumn, + this.tagDataGridViewTextBoxColumn}); + this.dataGridView1.DataSource = this.bs; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 120); + this.dataGridView1.Location = new System.Drawing.Point(0, 158); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(906, 512); + this.dataGridView1.Size = new System.Drawing.Size(1138, 370); this.dataGridView1.TabIndex = 1; // // button3 @@ -131,17 +215,31 @@ // // panel1 // - this.panel1.Controls.Add(this.cmbUser); - this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.nudname); + this.panel1.Controls.Add(this.label21); + this.panel1.Controls.Add(this.nuduid); + this.panel1.Controls.Add(this.label20); + this.panel1.Controls.Add(this.nudot); + this.panel1.Controls.Add(this.label19); + this.panel1.Controls.Add(this.nudhrd); + this.panel1.Controls.Add(this.label18); + this.panel1.Controls.Add(this.nudbio); + this.panel1.Controls.Add(this.nudst); + this.panel1.Controls.Add(this.label17); + this.panel1.Controls.Add(this.label12); + this.panel1.Controls.Add(this.nuditem); + this.panel1.Controls.Add(this.nudpack); + this.panel1.Controls.Add(this.label16); + this.panel1.Controls.Add(this.label11); + this.panel1.Controls.Add(this.nudbunru); + this.panel1.Controls.Add(this.nudreq); + this.panel1.Controls.Add(this.label15); + this.panel1.Controls.Add(this.label10); + this.panel1.Controls.Add(this.nudtype); + this.panel1.Controls.Add(this.label13); + this.panel1.Controls.Add(this.nuddate); + this.panel1.Controls.Add(this.label9); this.panel1.Controls.Add(this.checkBox1); - this.panel1.Controls.Add(this.numericUpDown2); - this.panel1.Controls.Add(this.label6); - this.panel1.Controls.Add(this.ed); - this.panel1.Controls.Add(this.sd); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.nudCE); - this.panel1.Controls.Add(this.nudCS); - this.panel1.Controls.Add(this.label5); this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.nudE); this.panel1.Controls.Add(this.nudS); @@ -155,19 +253,10 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(906, 120); + this.panel1.Size = new System.Drawing.Size(1138, 158); this.panel1.TabIndex = 0; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(362, 95); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(29, 12); - this.label7.TabIndex = 21; - this.label7.Text = "사번"; - // // checkBox1 // this.checkBox1.AutoSize = true; @@ -178,87 +267,6 @@ this.checkBox1.Text = "Auto Delete Import"; this.checkBox1.UseVisualStyleBackColor = true; // - // numericUpDown2 - // - this.numericUpDown2.Location = new System.Drawing.Point(406, 63); - this.numericUpDown2.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.numericUpDown2.Name = "numericUpDown2"; - this.numericUpDown2.Size = new System.Drawing.Size(45, 21); - this.numericUpDown2.TabIndex = 18; - this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numericUpDown2.Value = new decimal(new int[] { - 3, - 0, - 0, - 0}); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(312, 67); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(87, 12); - this.label6.TabIndex = 17; - this.label6.Text = "Column Name"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(455, 13); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(14, 12); - this.label4.TabIndex = 14; - this.label4.Text = "~"; - // - // nudCE - // - this.nudCE.Location = new System.Drawing.Point(474, 9); - this.nudCE.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.nudCE.Name = "nudCE"; - this.nudCE.Size = new System.Drawing.Size(45, 21); - this.nudCE.TabIndex = 13; - this.nudCE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudCE.Value = new decimal(new int[] { - 14, - 0, - 0, - 0}); - // - // nudCS - // - this.nudCS.Location = new System.Drawing.Point(406, 9); - this.nudCS.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.nudCS.Name = "nudCS"; - this.nudCS.Size = new System.Drawing.Size(45, 21); - this.nudCS.TabIndex = 12; - this.nudCS.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudCS.Value = new decimal(new int[] { - 2, - 0, - 0, - 0}); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(335, 13); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(64, 12); - this.label5.TabIndex = 11; - this.label5.Text = "Col Range"; - // // label3 // this.label3.AutoSize = true; @@ -355,14 +363,14 @@ this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, this.progressBar1}); - this.bn.Location = new System.Drawing.Point(0, 632); + this.bn.Location = new System.Drawing.Point(0, 604); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(906, 25); + this.bn.Size = new System.Drawing.Size(1138, 25); this.bn.TabIndex = 2; this.bn.Text = "bindingNavigator1"; // @@ -375,6 +383,11 @@ this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); this.bindingNavigatorAddNewItem.Text = "새로 추가"; // + // bs + // + this.bs.DataMember = "JobReport"; + this.bs.DataSource = this.dsPRJ; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -418,6 +431,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"; @@ -457,35 +471,562 @@ this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(200, 22); // - // sd + // panel2 // - this.sd.Location = new System.Drawing.Point(42, 40); - this.sd.Name = "sd"; - this.sd.Size = new System.Drawing.Size(170, 21); - this.sd.TabIndex = 15; + this.panel2.BackColor = System.Drawing.Color.HotPink; + this.panel2.Controls.Add(this.button2); + this.panel2.Controls.Add(this.comboBox1); + this.panel2.Controls.Add(this.label8); + this.panel2.Controls.Add(this.checkBox2); + this.panel2.Controls.Add(this.dateTimePicker1); + this.panel2.Controls.Add(this.dateTimePicker2); + this.panel2.Controls.Add(this.label14); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 528); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1138, 76); + this.panel2.TabIndex = 3; // - // ed + // comboBox1 // - this.ed.Location = new System.Drawing.Point(42, 67); - this.ed.Name = "ed"; - this.ed.Size = new System.Drawing.Size(170, 21); - this.ed.TabIndex = 16; + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(457, 40); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(171, 20); + this.comboBox1.TabIndex = 22; // - // cmbUser + // label8 // - this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbUser.FormattingEnabled = true; - this.cmbUser.Location = new System.Drawing.Point(397, 90); - this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(171, 20); - this.cmbUser.TabIndex = 22; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(422, 45); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(29, 12); + this.label8.TabIndex = 21; + this.label8.Text = "사번"; + // + // checkBox2 + // + this.checkBox2.AutoSize = true; + this.checkBox2.Location = new System.Drawing.Point(639, 40); + this.checkBox2.Name = "checkBox2"; + this.checkBox2.Size = new System.Drawing.Size(89, 16); + this.checkBox2.TabIndex = 19; + this.checkBox2.Text = "Import Only"; + this.checkBox2.UseVisualStyleBackColor = true; + // + // dateTimePicker1 + // + this.dateTimePicker1.Location = new System.Drawing.Point(229, 40); + this.dateTimePicker1.Name = "dateTimePicker1"; + this.dateTimePicker1.Size = new System.Drawing.Size(170, 21); + this.dateTimePicker1.TabIndex = 16; + // + // dateTimePicker2 + // + this.dateTimePicker2.Location = new System.Drawing.Point(42, 40); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(170, 21); + this.dateTimePicker2.TabIndex = 15; + // + // label14 + // + this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50))))); + this.label14.Dock = System.Windows.Forms.DockStyle.Top; + this.label14.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label14.ForeColor = System.Drawing.Color.Gold; + this.label14.Location = new System.Drawing.Point(0, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(1138, 28); + this.label14.TabIndex = 2; + this.label14.Text = "기존 자료 삭제"; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(741, 35); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(102, 21); + this.button2.TabIndex = 23; + this.button2.Text = "RUN"; + this.button2.UseVisualStyleBackColor = true; + // + // nuddate + // + this.nuddate.Location = new System.Drawing.Point(20, 120); + this.nuddate.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nuddate.Name = "nuddate"; + this.nuddate.Size = new System.Drawing.Size(45, 21); + this.nuddate.TabIndex = 24; + this.nuddate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nuddate.Value = new decimal(new int[] { + 3, + 0, + 0, + 0}); + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(26, 102); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(29, 12); + this.label9.TabIndex = 23; + this.label9.Text = "날짜"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(77, 102); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(29, 12); + this.label10.TabIndex = 23; + this.label10.Text = "요청"; + // + // nudreq + // + this.nudreq.Location = new System.Drawing.Point(71, 120); + this.nudreq.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudreq.Name = "nudreq"; + this.nudreq.Size = new System.Drawing.Size(45, 21); + this.nudreq.TabIndex = 24; + this.nudreq.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudreq.Value = new decimal(new int[] { + 4, + 0, + 0, + 0}); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(128, 102); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(41, 12); + this.label11.TabIndex = 23; + this.label11.Text = "패키지"; + // + // nudpack + // + this.nudpack.Location = new System.Drawing.Point(122, 120); + this.nudpack.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudpack.Name = "nudpack"; + this.nudpack.Size = new System.Drawing.Size(45, 21); + this.nudpack.TabIndex = 24; + this.nudpack.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudpack.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(179, 102); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(29, 12); + this.label12.TabIndex = 23; + this.label12.Text = "상태"; + // + // nudst + // + this.nudst.Location = new System.Drawing.Point(173, 120); + this.nudst.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudst.Name = "nudst"; + this.nudst.Size = new System.Drawing.Size(45, 21); + this.nudst.TabIndex = 24; + this.nudst.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudst.Value = new decimal(new int[] { + 6, + 0, + 0, + 0}); + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(230, 102); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(29, 12); + this.label13.TabIndex = 23; + this.label13.Text = "형태"; + // + // nudtype + // + this.nudtype.Location = new System.Drawing.Point(224, 120); + this.nudtype.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudtype.Name = "nudtype"; + this.nudtype.Size = new System.Drawing.Size(45, 21); + this.nudtype.TabIndex = 24; + this.nudtype.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudtype.Value = new decimal(new int[] { + 7, + 0, + 0, + 0}); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(281, 102); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(29, 12); + this.label15.TabIndex = 23; + this.label15.Text = "분류"; + // + // nudbunru + // + this.nudbunru.Location = new System.Drawing.Point(275, 120); + this.nudbunru.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudbunru.Name = "nudbunru"; + this.nudbunru.Size = new System.Drawing.Size(45, 21); + this.nudbunru.TabIndex = 24; + this.nudbunru.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudbunru.Value = new decimal(new int[] { + 8, + 0, + 0, + 0}); + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(332, 102); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(41, 12); + this.label16.TabIndex = 23; + this.label16.Text = "아이템"; + // + // nuditem + // + this.nuditem.Location = new System.Drawing.Point(326, 120); + this.nuditem.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nuditem.Name = "nuditem"; + this.nuditem.Size = new System.Drawing.Size(45, 21); + this.nuditem.TabIndex = 24; + this.nuditem.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nuditem.Value = new decimal(new int[] { + 9, + 0, + 0, + 0}); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(383, 102); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(29, 12); + this.label17.TabIndex = 23; + this.label17.Text = "비고"; + // + // nudbio + // + this.nudbio.Location = new System.Drawing.Point(377, 120); + this.nudbio.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudbio.Name = "nudbio"; + this.nudbio.Size = new System.Drawing.Size(45, 21); + this.nudbio.TabIndex = 24; + this.nudbio.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudbio.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + // + // nudhrd + // + this.nudhrd.Location = new System.Drawing.Point(428, 120); + this.nudhrd.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudhrd.Name = "nudhrd"; + this.nudhrd.Size = new System.Drawing.Size(45, 21); + this.nudhrd.TabIndex = 26; + this.nudhrd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudhrd.Value = new decimal(new int[] { + 11, + 0, + 0, + 0}); + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(434, 102); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(29, 12); + this.label18.TabIndex = 25; + this.label18.Text = "시간"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(485, 102); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(22, 12); + this.label19.TabIndex = 25; + this.label19.Text = "OT"; + // + // nudot + // + this.nudot.Location = new System.Drawing.Point(479, 120); + this.nudot.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudot.Name = "nudot"; + this.nudot.Size = new System.Drawing.Size(45, 21); + this.nudot.TabIndex = 26; + this.nudot.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudot.Value = new decimal(new int[] { + 12, + 0, + 0, + 0}); + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(536, 102); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(29, 12); + this.label20.TabIndex = 25; + this.label20.Text = "사번"; + // + // nuduid + // + this.nuduid.Location = new System.Drawing.Point(530, 120); + this.nuduid.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nuduid.Name = "nuduid"; + this.nuduid.Size = new System.Drawing.Size(45, 21); + this.nuduid.TabIndex = 26; + this.nuduid.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(587, 102); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(29, 12); + this.label21.TabIndex = 25; + this.label21.Text = "성명"; + // + // nudname + // + this.nudname.Location = new System.Drawing.Point(581, 120); + this.nudname.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudname.Name = "nudname"; + this.nudname.Size = new System.Drawing.Size(45, 21); + this.nudname.TabIndex = 26; + this.nudname.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudname.Value = new decimal(new int[] { + 16, + 0, + 0, + 0}); + // + // dsPRJ + // + this.dsPRJ.DataSetName = "dsPRJ"; + this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // jobReportTableAdapter + // + this.jobReportTableAdapter.ClearBeforeFill = true; + // + // idxDataGridViewTextBoxColumn + // + this.idxDataGridViewTextBoxColumn.DataPropertyName = "idx"; + this.idxDataGridViewTextBoxColumn.HeaderText = "idx"; + this.idxDataGridViewTextBoxColumn.Name = "idxDataGridViewTextBoxColumn"; + this.idxDataGridViewTextBoxColumn.ReadOnly = true; + // + // pdateDataGridViewTextBoxColumn + // + this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate"; + this.pdateDataGridViewTextBoxColumn.HeaderText = "pdate"; + this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn"; + // + // uidDataGridViewTextBoxColumn + // + this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid"; + this.uidDataGridViewTextBoxColumn.HeaderText = "uid"; + this.uidDataGridViewTextBoxColumn.Name = "uidDataGridViewTextBoxColumn"; + // + // typeDataGridViewTextBoxColumn + // + this.typeDataGridViewTextBoxColumn.DataPropertyName = "type"; + this.typeDataGridViewTextBoxColumn.HeaderText = "type"; + this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn"; + // + // hrsDataGridViewTextBoxColumn + // + this.hrsDataGridViewTextBoxColumn.DataPropertyName = "hrs"; + this.hrsDataGridViewTextBoxColumn.HeaderText = "hrs"; + this.hrsDataGridViewTextBoxColumn.Name = "hrsDataGridViewTextBoxColumn"; + // + // wuidDataGridViewTextBoxColumn + // + this.wuidDataGridViewTextBoxColumn.DataPropertyName = "wuid"; + this.wuidDataGridViewTextBoxColumn.HeaderText = "wuid"; + this.wuidDataGridViewTextBoxColumn.Name = "wuidDataGridViewTextBoxColumn"; + // + // wdateDataGridViewTextBoxColumn + // + this.wdateDataGridViewTextBoxColumn.DataPropertyName = "wdate"; + this.wdateDataGridViewTextBoxColumn.HeaderText = "wdate"; + this.wdateDataGridViewTextBoxColumn.Name = "wdateDataGridViewTextBoxColumn"; + // + // usernameDataGridViewTextBoxColumn + // + this.usernameDataGridViewTextBoxColumn.DataPropertyName = "username"; + this.usernameDataGridViewTextBoxColumn.HeaderText = "username"; + this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn"; + this.usernameDataGridViewTextBoxColumn.ReadOnly = true; + // + // pidxDataGridViewTextBoxColumn + // + this.pidxDataGridViewTextBoxColumn.DataPropertyName = "pidx"; + this.pidxDataGridViewTextBoxColumn.HeaderText = "pidx"; + this.pidxDataGridViewTextBoxColumn.Name = "pidxDataGridViewTextBoxColumn"; + // + // requestpartDataGridViewTextBoxColumn + // + this.requestpartDataGridViewTextBoxColumn.DataPropertyName = "requestpart"; + this.requestpartDataGridViewTextBoxColumn.HeaderText = "requestpart"; + this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn"; + // + // packageDataGridViewTextBoxColumn + // + this.packageDataGridViewTextBoxColumn.DataPropertyName = "package"; + this.packageDataGridViewTextBoxColumn.HeaderText = "package"; + this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn"; + // + // statusDataGridViewTextBoxColumn + // + this.statusDataGridViewTextBoxColumn.DataPropertyName = "status"; + this.statusDataGridViewTextBoxColumn.HeaderText = "status"; + this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn"; + // + // descriptionDataGridViewTextBoxColumn + // + this.descriptionDataGridViewTextBoxColumn.DataPropertyName = "description"; + this.descriptionDataGridViewTextBoxColumn.HeaderText = "description"; + this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn"; + // + // remarkDataGridViewTextBoxColumn + // + this.remarkDataGridViewTextBoxColumn.DataPropertyName = "remark"; + this.remarkDataGridViewTextBoxColumn.HeaderText = "remark"; + this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; + // + // importDataGridViewCheckBoxColumn + // + this.importDataGridViewCheckBoxColumn.DataPropertyName = "import"; + this.importDataGridViewCheckBoxColumn.HeaderText = "import"; + this.importDataGridViewCheckBoxColumn.Name = "importDataGridViewCheckBoxColumn"; + // + // projectNameDataGridViewTextBoxColumn + // + this.projectNameDataGridViewTextBoxColumn.DataPropertyName = "projectName"; + this.projectNameDataGridViewTextBoxColumn.HeaderText = "projectName"; + this.projectNameDataGridViewTextBoxColumn.Name = "projectNameDataGridViewTextBoxColumn"; + // + // weekDataGridViewTextBoxColumn + // + this.weekDataGridViewTextBoxColumn.DataPropertyName = "week"; + this.weekDataGridViewTextBoxColumn.HeaderText = "week"; + this.weekDataGridViewTextBoxColumn.Name = "weekDataGridViewTextBoxColumn"; + // + // otDataGridViewTextBoxColumn + // + this.otDataGridViewTextBoxColumn.DataPropertyName = "ot"; + this.otDataGridViewTextBoxColumn.HeaderText = "ot"; + this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn"; + // + // wwDataGridViewTextBoxColumn + // + this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww"; + this.wwDataGridViewTextBoxColumn.HeaderText = "ww"; + this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn"; + this.wwDataGridViewTextBoxColumn.ReadOnly = true; + // + // processDataGridViewTextBoxColumn + // + this.processDataGridViewTextBoxColumn.DataPropertyName = "process"; + this.processDataGridViewTextBoxColumn.HeaderText = "process"; + this.processDataGridViewTextBoxColumn.Name = "processDataGridViewTextBoxColumn"; + // + // gcodeDataGridViewTextBoxColumn + // + this.gcodeDataGridViewTextBoxColumn.DataPropertyName = "gcode"; + this.gcodeDataGridViewTextBoxColumn.HeaderText = "gcode"; + this.gcodeDataGridViewTextBoxColumn.Name = "gcodeDataGridViewTextBoxColumn"; + // + // description2DataGridViewTextBoxColumn + // + this.description2DataGridViewTextBoxColumn.DataPropertyName = "description2"; + this.description2DataGridViewTextBoxColumn.HeaderText = "description2"; + this.description2DataGridViewTextBoxColumn.Name = "description2DataGridViewTextBoxColumn"; + // + // tagDataGridViewTextBoxColumn + // + this.tagDataGridViewTextBoxColumn.DataPropertyName = "tag"; + this.tagDataGridViewTextBoxColumn.HeaderText = "tag"; + this.tagDataGridViewTextBoxColumn.Name = "tagDataGridViewTextBoxColumn"; // // fJobReportImport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(906, 657); + this.ClientSize = new System.Drawing.Size(1138, 629); this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.panel2); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); this.Name = "fJobReportImport"; @@ -494,9 +1035,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCE)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCS)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudE)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudS)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); @@ -504,6 +1042,21 @@ this.bn.ResumeLayout(false); this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nuddate)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudreq)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudpack)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudst)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudtype)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudbunru)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nuditem)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudbio)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudhrd)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudot)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nuduid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudname)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -537,16 +1090,63 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.NumericUpDown nudE; private System.Windows.Forms.NumericUpDown nudS; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.NumericUpDown nudCE; - private System.Windows.Forms.NumericUpDown nudCS; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.NumericUpDown numericUpDown2; - private System.Windows.Forms.Label label6; private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.DateTimePicker ed; - private System.Windows.Forms.DateTimePicker sd; - private System.Windows.Forms.ComboBox cmbUser; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.DateTimePicker dateTimePicker1; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.NumericUpDown nudname; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.NumericUpDown nuduid; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.NumericUpDown nudot; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.NumericUpDown nudhrd; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.NumericUpDown nudbio; + private System.Windows.Forms.NumericUpDown nudst; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.NumericUpDown nuditem; + private System.Windows.Forms.NumericUpDown nudpack; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.NumericUpDown nudbunru; + private System.Windows.Forms.NumericUpDown nudreq; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.NumericUpDown nudtype; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.NumericUpDown nuddate; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.DataGridViewTextBoxColumn idxDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn uidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn typeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn hrsDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wuidDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wdateDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn usernameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn pidxDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn requestpartDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn packageDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn statusDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewCheckBoxColumn importDataGridViewCheckBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn weekDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn processDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn gcodeDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn description2DataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn tagDataGridViewTextBoxColumn; + private dsPRJ dsPRJ; + private dsPRJTableAdapters.JobReportTableAdapter jobReportTableAdapter; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReportImport.cs b/SubProject/FPJ0000/JobReport_/fJobReportImport.cs index 793842f..4b3f5b9 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReportImport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReportImport.cs @@ -21,43 +21,45 @@ namespace FPJ0000.JobReport_ private void __Load(object sender, EventArgs e) { - this.sd.Value = DateTime.Parse( DateTime.Now.Year.ToString("0000") + "-01-01"); - this.ed.Value = DateTime.Now; + //this.sd.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01"); + //this.ed.Value = DateTime.Now; //담당자목록 var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false); - this.cmbUser.DisplayMember = "dispName"; - this.cmbUser.ValueMember = "id"; - this.cmbUser.DataSource = dt_users; + //this.cmbUser.DisplayMember = "dispName"; + //this.cmbUser.ValueMember = "id"; + //this.cmbUser.DataSource = dt_users; } void __Closed(object sender, FormClosedEventArgs e) { - + } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { OpenFileDialog od = new OpenFileDialog(); od.Filter = "excel|*.xlsx|all files|*.*"; - // od.InitialDirectory = FCOMMON.Util.CurrentPath + "model"; + // od.InitialDirectory = FCOMMON.Util.CurrentPath + "model"; od.FilterIndex = 1; od.RestoreDirectory = true; if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; textBox1.Text = od.FileName; } + string sd = ""; + string ed = ""; private void button1_Click(object sender, EventArgs e) { - int ColumnNameNo = (int)numericUpDown2.Value; - if(textBox1.Text.Trim() == "") + + if (textBox1.Text.Trim() == "") { FCOMMON.Util.MsgE("파일을 선택하세요"); textBox1.Focus(); return; } - if(!System.IO.File.Exists(textBox1.Text)) + if (!System.IO.File.Exists(textBox1.Text)) { FCOMMON.Util.MsgE("입력하신 파일이 존재하지 않습니다."); textBox1.Focus(); @@ -65,17 +67,16 @@ namespace FPJ0000.JobReport_ return; } - dtExcel.Columns.Clear(); - dtExcel.Rows.Clear(); - dtExcel.AcceptChanges(); - + + libxl.Book book;// = new libxl.BinBook(); book = new libxl.XmlBook(); book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey); try { book.load(textBox1.Text); - }catch (Exception ex) + } + catch (Exception ex) { FCOMMON.Util.MsgE(ex.Message); return; @@ -88,132 +89,168 @@ namespace FPJ0000.JobReport_ book = null; return; } + var sheet = book.getSheet(sheetNum); - var MaxRow = sheet.lastRow(); + var MaxRow = sheet.lastRow(); var MinRow = sheet.firstRow(); - MaxRow = (int)Math.Min(MaxRow, nudE.Value-1); - MinRow = (int)Math.Max(MinRow, nudS.Value-1); - if(MinRow <= (ColumnNameNo-1)) - { - FCOMMON.Util.MsgI("시작줄을 제목줄 보다 커야 합니다. 자동으로 +1 증가합니다."); - MinRow = ColumnNameNo ; - } + MaxRow = (int)Math.Min(MaxRow, nudE.Value - 1); + MinRow = (int)Math.Max(MinRow, nudS.Value - 1); + var MaxCol = sheet.lastCol(); var MinCol = sheet.firstCol(); - MaxCol = (int)Math.Min(MaxCol, nudCE.Value - 1); - MinCol = (int)Math.Max(MinCol, nudCS.Value - 1); - //제목줄을 처리한다. 181029 - List cols = new List(); - string sDate = sd.Value.ToShortDateString(); - string eDate = ed.Value.ToShortDateString(); - - for (int c = MinCol; c <= MaxCol; c++) + //현재 자료 모두 삭제 + this.dsPRJ.JobReport.Clear(); + this.dsPRJ.JobReport.AcceptChanges(); + var dt_users = FCOMMON.DBM.getUserTable(); + + try { - var strVallue = sheet.readStr(ColumnNameNo-1, c); - if (strVallue.Trim()=="" ) - { - if (c == MinCol) - { - //첫줄 첫행이 빈값이면 처리하지 않는다. - FCOMMON.Util.MsgE("열 제목에 빈값이 있어 처리되지 못합니다."); - return; - } - else - { - //빈값이 나왓으므로 열 최대값을 변경해준다. - if(c < MaxCol) - { - FCOMMON.Util.MsgI("빈값으로 인해 최대 열 번호를 " + c.ToString() + "로 변경합니다"); - MaxCol = c; - break; - } - } - } - cols.Add(strVallue); - this.dtExcel.Columns.Add(strVallue); - - } - - - try{ for (int r = MinRow; r <= MaxRow; r++) { - DataRow dr = dtExcel.NewRow(); + var dr = this.dsPRJ.JobReport.NewJobReportRow(); + dr.wdate = DateTime.Now; + dr.import = true; + dr.wuid = "dev"; + dr.gcode = FCOMMON.info.Login.gcode; + dr.pidx = -1; - Boolean nullColumn = false; - for (int c = MinCol; c <= MaxCol; c++) + //날짜읽기 + var colidx = 0;// + if (nuddate.Value > 0) { - if (sheet.isDate(r, c)) + colidx = (int)(nuddate.Value - 1); + if (sheet.isDate(r, colidx)) { - var datevalue = sheet.readNum(r, c); + var datevalue = sheet.readNum(r, colidx); int y, m, d; y = m = d = 0; book.dateUnpack(datevalue, ref y, ref m, ref d); - if (y == 1900) y = DateTime.Now.Year; - if (y >= 2000) - dr[cols[c - MinCol]] = string.Format("{0:0000}-{1:00}-{2:00}", y, m, d); - else - dr[cols[c - MinCol]] = string.Empty; - - //일자가 만약 넘어서면 패스한다. - if(cols[c]=="일자" ) - { - string value = dr[cols[c - MinCol]].ToString(); - if(value == "") - { - nullColumn = true; //날짜가 없다면 패스 - break; - } else if(value.CompareTo(sDate) < 0) - { - nullColumn = true; //과거데이터라서 패스 - break; - } else if(value.CompareTo(eDate) > 0) - { - nullColumn = true; //미래데이터 패스 - break; - } - } + dr.pdate = string.Format("{0:0000}-{1:00}-{2:00}", y, m, d); } else { - var dateStrin = sheet.readStr(r, c); - - var strVallue = sheet.readStr(r, c); - if (strVallue.Trim() == "" && c == MinCol) + dr.pdate = sheet.readStr(r, colidx); + var spldat = dr.pdate.Split('/'); + if (spldat.Length == 2) { - //첫줄 첫행이 빈값이면 처리하지 않는다. - nullColumn = true; - break; + dr.pdate = DateTime.Now.Year.ToString("0000") + "-" + spldat[0].PadLeft(2, '0') + "-" + spldat[1].PadLeft(2, '0'); } - if (cols[c - MinCol].Trim() != "") - dr[cols[c - MinCol]] = strVallue; } } - if (nullColumn) continue; //줄처리를 못한 경우 넘어감 - if (dr != null) + + //요청 + if (nudreq.Value > 0) { - dtExcel.Rows.Add(dr); + colidx = (int)(nudreq.Value - 1); + dr.requestpart = sheet.readStr(r, colidx); } + + //패키지 + if (nudpack.Value > 0) + { + colidx = (int)(nudpack.Value - 1); + dr.package = sheet.readStr(r, colidx); + } + + //상태 + if (nudst.Value > 0) + { + colidx = (int)(nudst.Value - 1); + dr.status = sheet.readStr(r, colidx); + } + + //형태 + if (nudtype.Value > 0) + { + colidx = (int)(nudtype.Value - 1); + dr.type = sheet.readStr(r, colidx); + } + + //분류 + if (nudbunru.Value > 0) + { + colidx = (int)(nudbunru.Value - 1); + dr.process = sheet.readStr(r, colidx); + } + + //프로젝트/아이템 + if (nuditem.Value > 0) + { + colidx = (int)(nuditem.Value - 1); + dr.projectName = sheet.readStr(r, colidx); + } + + //비고 + if (nudbio.Value > 0) + { + colidx = (int)(nudbio.Value - 1); + dr.description = sheet.readStr(r, colidx); + } + + //시간 + if (nudhrd.Value > 0) + { + colidx = (int)(nudhrd.Value - 1); + try + { + dr.hrs = sheet.readNum(r, colidx); + } + catch { dr.hrs = 0; } + + } + //OT + if (nudot.Value > 0) + { + colidx = (int)(nudot.Value - 1); + try + { + dr.ot = sheet.readNum(r, colidx); + } + catch { dr.ot = 0; } + + } + //uid + if (nuduid.Value > 0) + { + colidx = (int)(nuduid.Value - 1); + dr.uid = sheet.readStr(r, colidx); + } + + //susername + if (nudname.Value > 0) + { + colidx = (int)(nudname.Value - 1); + if(string.IsNullOrEmpty(dr.uid)==true) + { + var username = sheet.readStr(r, colidx); + var users = dt_users.Select("name='" + username + "'"); + if(users.Length == 1) + { + dr.uid = users[0]["id"].ToString(); + } + } + + } + + this.dsPRJ.JobReport.AddJobReportRow(dr); } - dtExcel.AcceptChanges(); } - catch(Exception ex) + catch (Exception ex) { FCOMMON.Util.MsgE("불러오는 중 오류 발생\n" + ex.Message); } // book = null; - this.bs.DataSource = dtExcel; - this.dataGridView1.DataSource = dtExcel; + this.bn.BindingSource = this.bs; - if(this.bs.Count < 1) + if (this.bs.Count < 1) { FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다."); } @@ -222,16 +259,11 @@ namespace FPJ0000.JobReport_ private void button3_Click(object sender, EventArgs e) { - if(dtExcel == null || dtExcel.Rows.Count < 1) + if (dsPRJ.JobReport == null || dsPRJ.JobReport.Rows.Count < 1) { FCOMMON.Util.MsgE("등록 가능한 자료가 없습니다."); return; } - if(cmbUser.SelectedValue == null || cmbUser.Text.Trim()=="") - { - FCOMMON.Util.MsgE("사번이 입력되지 않았습니다."); - return; - } System.Text.StringBuilder sb = new StringBuilder(); sb.AppendLine("다음 자료를 추가하시겠습니까?"); @@ -241,75 +273,12 @@ namespace FPJ0000.JobReport_ sb.AppendLine("실행 하려면 '예' 를 누르세요"); var dlg = FCOMMON.Util.MsgQ(sb.ToString()); if (dlg != System.Windows.Forms.DialogResult.Yes) return; - - - - dt.Clear(); - dt.AcceptChanges(); - - this.progressBar1.Value = 0; - this.progressBar1.Maximum = dtExcel.Rows.Count; - - //12,13 - foreach (DataRow dr in dtExcel.Rows) - { - this.progressBar1.Value += 1; - - //데이터추가 - var newdr = dt.NewRow(); - if (dr[1] == DBNull.Value || dr[1].ToString()=="") continue; //nullerror - - var strdate = dr[1].ToString().Replace('/','-'); - var datebuf = strdate.Split('-'); - if (datebuf.Length == 2) - { - strdate = DateTime.Now.Year.ToString("0000") + "-" + - datebuf[0].PadLeft(2, '0') + "-" + - datebuf[1].PadLeft(2, '0'); - } - newdr["pdate"] = strdate; - - newdr["uid"] = cmbUser.SelectedValue.ToString(); // tbNo.Text.Trim(); - newdr["requestpart"] = dr[2].ToString().Trim(); - newdr["package"] = dr[3].ToString().Trim(); - newdr["status"] = dr[4].ToString().Trim(); - newdr["type"] = dr[5].ToString(); - newdr["process"] = dr[6].ToString(); - newdr["projectName"] = dr[7].ToString(); - newdr["description"] = dr[8].ToString(); - //프로젝트이름을 검색해서 PIDX를 결정해준다. - newdr["pidx"] = -1;// dr[3].ToString(); - - string hrsstr = ""; - if (dr[9] != DBNull.Value) hrsstr = dr[9].ToString().Trim(); - if (hrsstr.Trim() == "") hrsstr = "0"; - newdr["hrs"] = double.Parse(hrsstr); - - string otstr = ""; - if (dr[10] != DBNull.Value) otstr = dr[10].ToString().Trim(); - if (otstr.Trim() == "") otstr = "0"; - newdr["ot"] = double.Parse(otstr); - - - - - - - - newdr["remark"] = ""; - - newdr["import"] = true; - newdr["wuid"] = FCOMMON.info.Login.no; - newdr["wdate"] = DateTime.Now; - - dt.Rows.Add(newdr); - } var taE = new dsPRJTableAdapters.JobReportTableAdapter(); - if (checkBox1.Checked) taE.DeleteImport(sd.Value.ToShortDateString(), ed.Value.ToShortDateString(), FCOMMON.info.Login.no, FCOMMON.info.Login.gcode); - taE.Update((dsPRJ.JobReportDataTable)dt); + //if (checkBox1.Checked) taE.DeleteImport(sd, ed, FCOMMON.info.Login.no, FCOMMON.info.Login.gcode); + taE.Update(dsPRJ.JobReport); dt.AcceptChanges(); FCOMMON.Util.MsgI("Save OK"); diff --git a/SubProject/FPJ0000/JobReport_/fJobReportImport.resx b/SubProject/FPJ0000/JobReport_/fJobReportImport.resx index ff94a8a..169479e 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReportImport.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReportImport.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 83, 17 + 17, 17 @@ -136,6 +139,9 @@ 83, 17 + + 147, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -188,4 +194,10 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + 147, 17 + + + 230, 17 + \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.Designer.cs b/SubProject/FPJ0000/JobReport_/rK5Dailyform.Designer.cs index 126c072..57ee31b 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.Designer.cs @@ -30,14 +30,14 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(rK5Dailyform)); - Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource(); - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series(); - System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series(); + Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsReport = new FPJ0000.dsReport(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -98,6 +98,7 @@ this.lbStt.Name = "lbStt"; this.lbStt.Size = new System.Drawing.Size(43, 34); this.lbStt.Text = "시작일"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); // // dtSD // @@ -121,6 +122,7 @@ this.toolStripLabel4.Name = "toolStripLabel4"; this.toolStripLabel4.Size = new System.Drawing.Size(43, 34); this.toolStripLabel4.Text = "종료일"; + this.toolStripLabel4.Click += new System.EventHandler(this.toolStripLabel4_Click); // // dtED // @@ -153,6 +155,7 @@ this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(65, 34); this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // toolStripButton1 // @@ -161,6 +164,7 @@ this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(64, 34); this.toolStripButton1.Text = "save"; + this.toolStripButton1.Visible = false; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // toolStripButton3 @@ -170,6 +174,7 @@ this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Size = new System.Drawing.Size(64, 34); this.toolStripButton3.Text = "load"; + this.toolStripButton3.Visible = false; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // ta @@ -179,9 +184,9 @@ // reportViewer1 // this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill; - reportDataSource1.Name = "DataSet1"; - reportDataSource1.Value = this.bs; - this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1); + reportDataSource2.Name = "DataSet1"; + reportDataSource2.Value = this.bs; + this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2); this.reportViewer1.LocalReport.EnableExternalImages = true; this.reportViewer1.LocalReport.EnableHyperlinks = true; this.reportViewer1.LocalReport.ReportEmbeddedResource = "FPJ0000.JobReport.rK5Dailyform.rdlc"; @@ -201,37 +206,38 @@ // // chart1 // - chartArea1.Name = "ChartArea1"; - this.chart1.ChartAreas.Add(chartArea1); - legend1.Name = "Legend1"; - this.chart1.Legends.Add(legend1); + chartArea2.Name = "ChartArea1"; + this.chart1.ChartAreas.Add(chartArea2); + legend2.Name = "Legend1"; + this.chart1.Legends.Add(legend2); this.chart1.Location = new System.Drawing.Point(225, 166); this.chart1.Name = "chart1"; - series1.ChartArea = "ChartArea1"; - series1.Legend = "Legend1"; - series1.Name = "Series1"; - series2.ChartArea = "ChartArea1"; - series2.Legend = "Legend1"; - series2.Name = "Series2"; - series3.ChartArea = "ChartArea1"; - series3.Legend = "Legend1"; - series3.Name = "Series3"; - series4.ChartArea = "ChartArea1"; - series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline; - series4.Legend = "Legend1"; - series4.Name = "Series4"; - series5.ChartArea = "ChartArea1"; - series5.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline; - series5.Legend = "Legend1"; - series5.Name = "Series5"; - this.chart1.Series.Add(series1); - this.chart1.Series.Add(series2); - this.chart1.Series.Add(series3); - this.chart1.Series.Add(series4); - this.chart1.Series.Add(series5); + series6.ChartArea = "ChartArea1"; + series6.Legend = "Legend1"; + series6.Name = "Series1"; + series7.ChartArea = "ChartArea1"; + series7.Legend = "Legend1"; + series7.Name = "Series2"; + series8.ChartArea = "ChartArea1"; + series8.Legend = "Legend1"; + series8.Name = "Series3"; + series9.ChartArea = "ChartArea1"; + series9.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline; + series9.Legend = "Legend1"; + series9.Name = "Series4"; + series10.ChartArea = "ChartArea1"; + series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline; + series10.Legend = "Legend1"; + series10.Name = "Series5"; + this.chart1.Series.Add(series6); + this.chart1.Series.Add(series7); + this.chart1.Series.Add(series8); + this.chart1.Series.Add(series9); + this.chart1.Series.Add(series10); this.chart1.Size = new System.Drawing.Size(611, 306); this.chart1.TabIndex = 7; this.chart1.Text = "chart1"; + this.chart1.Visible = false; // // rK5Dailyform // diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs index 597f4cb..b2fcf09 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.cs @@ -55,12 +55,19 @@ namespace FPJ0000.JobReport_ if (FCOMMON.info.Login.gcode.isEmpty() == false) gcode = FCOMMON.info.Login.gcode; + //var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter(); + //var rawdata0 = ta.GetData(FCOMMON.info.Login.gcode, sd, ed); var rawdata = db.vJobReportForUser.AsNoTracking() .Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1) .OrderBy(t => t.pdate).GroupBy(t => t.pdate); //ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString()); - this.progressBar1.Maximum = rawdata.Count(); + + + // var rawdata = rawdata0.GroupBy(t => t.pdate); + + this.progressBar1.Maximum = rawdata.Count(); + //날짜별로 묶음처리한다. //var grplist = rawdata.GroupBy(t => t.pdate); foreach (var item in rawdata) @@ -91,7 +98,7 @@ namespace FPJ0000.JobReport_ newdr2.Sign = string.Empty; newdr2.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); newdr2.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status == "진행 중").Count(); + newdr2.value = item.Where(t => t.svalue == "Technical Support" && t.status != "진행 완료").Count(); newdr2.graph = true; dsReport.K5DailyForm.AddK5DailyFormRow(newdr2); @@ -175,7 +182,7 @@ namespace FPJ0000.JobReport_ newdr8.Sign = string.Empty; newdr8.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00"); newdr8.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00"); - newdr8.value = (double)(item.Where(t => t.svalue == "Others").Sum(t => t.hrs)); + newdr8.value = (double)(item.Where(t => t.svalue != "Overhaul" && t.svalue != "Project" && t.svalue != "Training").Sum(t => t.hrs)); newdr8.graph = false; dsReport.K5DailyForm.AddK5DailyFormRow(newdr8); @@ -282,6 +289,12 @@ namespace FPJ0000.JobReport_ } this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.Normal); this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth; + + List parameters = new List(); + parameters.Add(new ReportParameter("sd", dtSD.Text)); + parameters.Add(new ReportParameter("ed", dtED.Text)); + reportViewer1.LocalReport.SetParameters(parameters); + this.reportViewer1.RefreshReport(); } @@ -326,9 +339,30 @@ namespace FPJ0000.JobReport_ //this.reportViewer1.LocalReport.SetParameters(new Microsoft.Reporting.WinForms.ReportParameter("chartfile", fni)); this.reportViewer1.RefreshReport(); + } + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Close(); + } + private void lbStt_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fSelectDay(DateTime.Parse(dtSD.Text)); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + var sdDate = f.dtPick.SelectionStart;// DateTime.Parse(DateTime.Now.ToString("yyyy-") + f.selectmon.ToString() + "-01"); + dtSD.Text = sdDate.ToShortDateString(); + if (f.dtPick.SelectionStart.ToShortDateString() == f.dtPick.SelectionEnd.ToShortDateString()) + dtED.Text = sdDate.AddMonths(1).AddDays(-1).ToShortDateString(); + else + dtED.Text = f.dtPick.SelectionEnd.ToShortDateString(); + } + private void toolStripLabel4_Click(object sender, EventArgs e) + { + var f = new FCOMMON.fSelectDay(DateTime.Parse(dtED.Text)); + if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; + dtED.Text = f.dtPick.SelectionStart.ToShortDateString(); } } } diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc b/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc index d28180e..71e93bf 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.rdlc @@ -90,6 +90,7 @@ LightGrey + Silver 2pt 2pt 2pt @@ -120,6 +121,7 @@ LightGrey + Silver 2pt 2pt 2pt @@ -470,437 +472,14 @@ - - - - - - - =Fields!pdate.Value - - - - - =Fields!pdate.Value - - - - - - - - - - - - =Fields!Item.Value - - - - =Fields!graph.Value - Equal - - true - - - - - - - =Fields!Item.Value - - - - - - - =Fields!Item.Value - - - - - =Fields!Item.Value - - - - - - - - - - - - - - - - =Sum(Fields!value.Value) - - - - - 8pt - #5c5c5c - - - - - - - False - - - - - - - - - - - - - - - 0.5 - - NaN - NaN - NaN - - - - 8pt - #5c5c5c - - - - - - - False - - - - - - - - - - - - - - - 0.5 - - NaN - Opposite - NaN - NaN - - - - 8pt - #5c5c5c - - - - - - - - - - - - - - - - - - - - - 0.5 - - NaN - NaN - NaN - - - - 8pt - #5c5c5c - - - - - - - - - - - - - - - - - - - - - 0.5 - - NaN - Opposite - NaN - NaN - - - - - - - - TopLeft - - - - - Black - Black - - - - - - - - Black - Black - - - - - 차트 제목 - - TopLeft - - - Pacific - - - - - 사용 가능한 데이터 없음 - - - DataSet1 - 2.56328cm - 0.49953cm - 5.21229cm - 10.13354cm - 1 - - - White - None - - - - External - ="D:\Amkor\GroupWare\a.jpg" - 2.56328cm - 11.61203cm - 9.01417cm - 12.37437cm - 2 - - - - - 5.34375in + 0.8545in Textbox1 - 0.84349cm - 0.89641cm + 0.29316cm + 0.35137cm 0.70583cm - 14.18167cm + 24.79146cm @@ -971,6 +554,18 @@ true ReportParameter1 + + String + true + true + ReportParameter1 + + + String + true + true + ReportParameter1 + @@ -982,6 +577,16 @@ 0 ImagePath + + 1 + 0 + sd + + + 2 + 0 + ed + diff --git a/SubProject/FPJ0000/JobReport_/rK5Dailyform.resx b/SubProject/FPJ0000/JobReport_/rK5Dailyform.resx index 299c0eb..b148bab 100644 --- a/SubProject/FPJ0000/JobReport_/rK5Dailyform.resx +++ b/SubProject/FPJ0000/JobReport_/rK5Dailyform.resx @@ -123,6 +123,9 @@ 123, 17 + + 123, 17 + 17, 17