From 88ebe5bedf192ab528dcbc6944d7f95e71d1c413 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Thu, 27 Jun 2024 14:12:18 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=AC=B4=EC=9D=BC=E3=85=88=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=AC=BC=EC=97=90=20=EA=B3=B5=EC=A0=95=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EA=B8=B0=EB=8A=A5=20=EC=97=B0=EA=B2=B0=20?=
 =?UTF-8?q?(=EA=B8=B0=EC=A1=B4=EC=97=90=EB=8A=94=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=96=88=EC=9C=BC=EB=82=98=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=EC=95=88=EB=90=98=EC=9E=88=EC=97=88=EC=9D=8C),=20?=
 =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=99=84=EB=A3=8C=EC=9D=BC=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EC=A0=95=EB=A0=AC=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sub/YARTE/HtmlEditor.cs                       |   2 +-
 Sub/YARTE/YARTE.csproj                        |  22 +-
 .../FPJ0000/JobReport_/rJobReportType.cs      |  30 +-
 .../FPJ0000/Project/fProjectList.Designer.cs  | 290 +++++++++---------
 SubProject/FPJ0000/Project/fProjectList.cs    |   4 +
 SubProject/FPJ0000/Project/fProjectList.resx  |  12 +
 SubProject/FPJ0000/dsReport.Designer.cs       |  85 ++++-
 SubProject/FPJ0000/dsReport.xsd               |  21 +-
 SubProject/FPJ0000/dsReport.xss               |  10 +-
 9 files changed, 309 insertions(+), 167 deletions(-)

diff --git a/Sub/YARTE/HtmlEditor.cs b/Sub/YARTE/HtmlEditor.cs
index d3b0e5c..0f9ab62 100644
--- a/Sub/YARTE/HtmlEditor.cs
+++ b/Sub/YARTE/HtmlEditor.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using mshtml;
+using MSHTML;
 using YARTE.UI.Buttons;
 using System.Diagnostics;
 
diff --git a/Sub/YARTE/YARTE.csproj b/Sub/YARTE/YARTE.csproj
index 9440090..c8184c2 100644
--- a/Sub/YARTE/YARTE.csproj
+++ b/Sub/YARTE/YARTE.csproj
@@ -87,17 +87,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="MSHTML">
-      <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\bold.gif" />
   </ItemGroup>
@@ -260,6 +249,17 @@
   <ItemGroup>
     <None Include="Resources\wordclean.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="MSHTML">
+      <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
+      <VersionMajor>4</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SubProject/FPJ0000/JobReport_/rJobReportType.cs b/SubProject/FPJ0000/JobReport_/rJobReportType.cs
index b795292..a500a44 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportType.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReportType.cs
@@ -97,8 +97,34 @@ namespace FPJ0000.JobReport_
             if (username.isEmpty() == false && username.StartsWith("--") == false)
                 uid = username.Substring(1, username.IndexOf("]") - 1);// "395552";
 
-
-            taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+            if (tbProcess.SelectedIndex == 0)
+            {
+                if(cmbUser.SelectedIndex == 0)
+                {
+                    //전체공정-전체인원
+                    taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+                }
+                else
+                {
+                    //전체공정-특정인원
+                    taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+                }
+            }
+            else
+            {
+                if (cmbUser.SelectedIndex == 0)
+                {
+                    //특정공정-전체인원
+                    taH.FillByProcess(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, tbProcess.Text);
+                }
+                else
+                {
+                    //특정공정-특정인원
+                    taH.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, vSD, vED, uid);
+                }
+                    
+                    
+            }
             //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
             //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
             //this.reportViewer1.RefreshReport();
diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
index 9eca948..6fea194 100644
--- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs
@@ -30,45 +30,45 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList));
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            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.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            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 numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = 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 textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            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 textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = 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.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
-            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            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.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType43 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType44 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType45 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType46 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType47 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType48 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType6 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType7 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+            FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType8 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -527,7 +527,7 @@
             this.toolStripMenuItem1,
             this.엑셀파일로저장ToolStripMenuItem});
             this.cm.Name = "contextMenuStrip1";
-            this.cm.Size = new System.Drawing.Size(297, 418);
+            this.cm.Size = new System.Drawing.Size(299, 418);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -537,14 +537,14 @@
             this.saveToolStripMenuItem,
             this.loadToolStripMenuItem});
             this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem";
-            this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.columnSizeToolStripMenuItem.Text = "열 너비";
             // 
             // autoToolStripMenuItem
             // 
             this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image")));
             this.autoToolStripMenuItem.Name = "autoToolStripMenuItem";
-            this.autoToolStripMenuItem.Size = new System.Drawing.Size(147, 36);
+            this.autoToolStripMenuItem.Size = new System.Drawing.Size(149, 36);
             this.autoToolStripMenuItem.Text = "Auto";
             this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click);
             // 
@@ -552,7 +552,7 @@
             // 
             this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image")));
             this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
-            this.resetToolStripMenuItem.Size = new System.Drawing.Size(147, 36);
+            this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 36);
             this.resetToolStripMenuItem.Text = "Reset";
             this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
             // 
@@ -560,7 +560,7 @@
             // 
             this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image")));
             this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
-            this.saveToolStripMenuItem.Size = new System.Drawing.Size(147, 36);
+            this.saveToolStripMenuItem.Size = new System.Drawing.Size(149, 36);
             this.saveToolStripMenuItem.Text = "Save";
             this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
             // 
@@ -568,40 +568,40 @@
             // 
             this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image")));
             this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
-            this.loadToolStripMenuItem.Size = new System.Drawing.Size(147, 36);
+            this.loadToolStripMenuItem.Size = new System.Drawing.Size(149, 36);
             this.loadToolStripMenuItem.Text = "Load";
             this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(293, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(295, 6);
             // 
             // 편집ToolStripMenuItem
             // 
             this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem";
-            this.편집ToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.편집ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.편집ToolStripMenuItem.Text = "편집";
             this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click);
             // 
             // partListToolStripMenuItem
             // 
             this.partListToolStripMenuItem.Name = "partListToolStripMenuItem";
-            this.partListToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.partListToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.partListToolStripMenuItem.Text = "부품목록";
             this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click);
             // 
             // iOMapToolStripMenuItem
             // 
             this.iOMapToolStripMenuItem.Name = "iOMapToolStripMenuItem";
-            this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.iOMapToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.iOMapToolStripMenuItem.Text = "I/O LIST";
             this.iOMapToolStripMenuItem.Click += new System.EventHandler(this.iOMapToolStripMenuItem_Click);
             // 
             // 공유폴더ToolStripMenuItem
             // 
             this.공유폴더ToolStripMenuItem.Name = "공유폴더ToolStripMenuItem";
-            this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.공유폴더ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.공유폴더ToolStripMenuItem.Text = "공유 폴더";
             this.공유폴더ToolStripMenuItem.Click += new System.EventHandler(this.공유폴더ToolStripMenuItem_Click);
             // 
@@ -609,52 +609,52 @@
             // 
             this.scheduleToolStripMenuItem.ForeColor = System.Drawing.Color.Black;
             this.scheduleToolStripMenuItem.Name = "scheduleToolStripMenuItem";
-            this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.scheduleToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.scheduleToolStripMenuItem.Text = "스케쥴 관리";
             this.scheduleToolStripMenuItem.Click += new System.EventHandler(this.scheduleToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(293, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(295, 6);
             // 
             // 메일발송주소관리ToolStripMenuItem
             // 
             this.메일발송주소관리ToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.메일발송주소관리ToolStripMenuItem.Name = "메일발송주소관리ToolStripMenuItem";
-            this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.메일발송주소관리ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.메일발송주소관리ToolStripMenuItem.Text = "메일발송 주소 관리";
             this.메일발송주소관리ToolStripMenuItem.Click += new System.EventHandler(this.메일발송주소관리ToolStripMenuItem_Click);
             // 
             // makeRepeatToolStripMenuItem
             // 
             this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem";
-            this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.makeRepeatToolStripMenuItem.Text = "복사";
             this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click);
             // 
             // 삭제ToolStripMenuItem
             // 
             this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
-            this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.삭제ToolStripMenuItem.Text = "삭제";
             this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
             // 
             // 편집ToolStripMenuItem1
             // 
             this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1";
-            this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(296, 36);
+            this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(298, 36);
             this.편집ToolStripMenuItem1.Text = "편집";
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(293, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(295, 6);
             // 
             // 엑셀파일로저장ToolStripMenuItem
             // 
             this.엑셀파일로저장ToolStripMenuItem.Name = "엑셀파일로저장ToolStripMenuItem";
-            this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(296, 36);
+            this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(298, 36);
             this.엑셀파일로저장ToolStripMenuItem.Text = "목록 내보내기";
             this.엑셀파일로저장ToolStripMenuItem.Click += new System.EventHandler(this.엑셀파일로저장ToolStripMenuItem_Click);
             // 
@@ -786,230 +786,230 @@
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
             this.fpSpread1_Sheet1.Columns.Get(0).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(0).CellType = numberCellType1;
+            numberCellType11.DecimalPlaces = 0;
+            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType11.MaximumValue = 2147483647D;
+            numberCellType11.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
             this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType26;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "category";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType27;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "userprocess";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
+            numberCellType12.DecimalPlaces = 0;
+            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType12.MaximumValue = 2147483647D;
+            numberCellType12.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType12;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pno";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project\r\nNo";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType28;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process";
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "Process / Equipment";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType29;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqSite";
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "Site";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType30;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqPlant";
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "Plant";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ReqPackage";
             this.fpSpread1_Sheet1.Columns.Get(7).Label = "PKG";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType32;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ReqLine";
             this.fpSpread1_Sheet1.Columns.Get(8).Label = "Line";
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType33;
             this.fpSpread1_Sheet1.Columns.Get(9).DataField = "part";
             this.fpSpread1_Sheet1.Columns.Get(9).Label = "Request Team";
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType34;
             this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name";
             this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(10).Label = "Project Title";
             this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType3.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
+            numberCellType13.DecimalPlaces = 0;
+            numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType13.MaximumValue = 2147483647D;
+            numberCellType13.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType13;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "finishrate";
             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;
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4;
+            numberCellType14.DecimalPlaces = 0;
+            numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType14.MaximumValue = 2147483647D;
+            numberCellType14.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType14;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ProgressPrj";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "완료(%)";
             this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType35;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "status";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "Status";
             this.fpSpread1_Sheet1.Columns.Get(13).Tag = "Status";
             this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType36;
             this.fpSpread1_Sheet1.Columns.Get(14).DataField = "kdate";
             this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(14).Label = "검토\r\n기한";
             this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType37;
             this.fpSpread1_Sheet1.Columns.Get(15).DataField = "lasthistory_date";
             this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Label = "업데이트";
             this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(15).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType38;
             this.fpSpread1_Sheet1.Columns.Get(16).DataField = "sdate";
             this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Label = "Start Date";
             this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(16).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType39;
             this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ddate";
             this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(17).Label = "Due Date";
             this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType40;
             this.fpSpread1_Sheet1.Columns.Get(18).DataField = "edate";
             this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(18).Label = "Done Date";
             this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5;
+            numberCellType15.DecimalPlaces = 0;
+            numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType15.MaximumValue = 2147483647D;
+            numberCellType15.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType15;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt";
             this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty";
             this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6;
+            numberCellType16.MaximumValue = 999999999999999D;
+            numberCellType16.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType16;
             this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo";
             this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n";
             this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7;
+            numberCellType17.MaximumValue = 999999999999999D;
+            numberCellType17.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType17;
             this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn";
             this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)";
             this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F;
             this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8;
+            numberCellType18.MaximumValue = 999999999999999D;
+            numberCellType18.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType18;
             this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste";
             this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set";
             this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F;
-            numberCellType9.MaximumValue = 999999999999999D;
-            numberCellType9.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9;
+            numberCellType19.MaximumValue = 999999999999999D;
+            numberCellType19.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType19;
             this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfic";
             this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI";
             this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType41;
             this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno";
             this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF";
             this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType42;
             this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion";
             this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion";
             this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType43;
             this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software";
             this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W";
             this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType44;
             this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design";
             this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design";
             this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType45;
             this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel";
             this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel";
             this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType46;
             this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory";
             this.fpSpread1_Sheet1.Columns.Get(29).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType47;
             this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo";
             this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo";
             this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType48;
             this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset";
             this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset";
             this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType49;
             this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model";
             this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#";
             this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType50;
             this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial";
             this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#";
             this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType10.DecimalPlaces = 0;
-            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10;
+            numberCellType20.DecimalPlaces = 0;
+            numberCellType20.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType20.MaximumValue = 2147483647D;
+            numberCellType20.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType20;
             this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin";
             this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민";
             this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(35).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType5;
             this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost";
             this.fpSpread1_Sheet1.Columns.Get(35).Label = "Cost\r\nSave";
             this.fpSpread1_Sheet1.Columns.Get(35).Tag = "costsave";
             this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F;
             this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType6;
             this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut";
             this.fpSpread1_Sheet1.Columns.Get(36).Label = "Fan\r\nOut";
             this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F;
             this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType7;
             this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight";
             this.fpSpread1_Sheet1.Columns.Get(37).Label = "High\r\nLight";
             this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight";
             this.fpSpread1_Sheet1.Columns.Get(37).Width = 39F;
             this.fpSpread1_Sheet1.Columns.Get(38).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType8;
             this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bmajoritem";
             this.fpSpread1_Sheet1.Columns.Get(38).Tag = "majoritem";
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
@@ -1831,7 +1831,7 @@
             this.label33.BackColor = System.Drawing.Color.Gainsboro;
             this.label33.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label33.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label33.Location = new System.Drawing.Point(670, 1);
+            this.label33.Location = new System.Drawing.Point(667, 1);
             this.label33.Margin = new System.Windows.Forms.Padding(0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(80, 27);
@@ -1846,7 +1846,7 @@
             this.label34.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label34.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
-            this.label34.Location = new System.Drawing.Point(224, 1);
+            this.label34.Location = new System.Drawing.Point(223, 1);
             this.label34.Margin = new System.Windows.Forms.Padding(0);
             this.label34.Name = "label34";
             this.label34.Size = new System.Drawing.Size(80, 27);
@@ -1861,7 +1861,7 @@
             this.label35.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label35.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.label35.Location = new System.Drawing.Point(447, 1);
+            this.label35.Location = new System.Drawing.Point(445, 1);
             this.label35.Margin = new System.Windows.Forms.Padding(0);
             this.label35.Name = "label35";
             this.label35.Size = new System.Drawing.Size(80, 27);
@@ -2237,7 +2237,7 @@
             this.lbcnt1.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbcnt1.Location = new System.Drawing.Point(85, 1);
             this.lbcnt1.Name = "lbcnt1";
-            this.lbcnt1.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt1.Size = new System.Drawing.Size(134, 27);
             this.lbcnt1.TabIndex = 1;
             this.lbcnt1.Text = "000";
             this.lbcnt1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2246,9 +2246,9 @@
             // 
             this.lbcnt2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbcnt2.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbcnt2.Location = new System.Drawing.Point(308, 1);
+            this.lbcnt2.Location = new System.Drawing.Point(307, 1);
             this.lbcnt2.Name = "lbcnt2";
-            this.lbcnt2.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt2.Size = new System.Drawing.Size(134, 27);
             this.lbcnt2.TabIndex = 1;
             this.lbcnt2.Text = "000";
             this.lbcnt2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2257,9 +2257,9 @@
             // 
             this.lbcnt3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbcnt3.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbcnt3.Location = new System.Drawing.Point(531, 1);
+            this.lbcnt3.Location = new System.Drawing.Point(529, 1);
             this.lbcnt3.Name = "lbcnt3";
-            this.lbcnt3.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt3.Size = new System.Drawing.Size(134, 27);
             this.lbcnt3.TabIndex = 1;
             this.lbcnt3.Text = "000";
             this.lbcnt3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2268,9 +2268,9 @@
             // 
             this.lbcnt4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbcnt4.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbcnt4.Location = new System.Drawing.Point(754, 1);
+            this.lbcnt4.Location = new System.Drawing.Point(751, 1);
             this.lbcnt4.Name = "lbcnt4";
-            this.lbcnt4.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt4.Size = new System.Drawing.Size(134, 27);
             this.lbcnt4.TabIndex = 1;
             this.lbcnt4.Text = "000";
             this.lbcnt4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2280,7 +2280,7 @@
             this.label40.BackColor = System.Drawing.Color.Gainsboro;
             this.label40.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label40.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label40.Location = new System.Drawing.Point(893, 1);
+            this.label40.Location = new System.Drawing.Point(889, 1);
             this.label40.Margin = new System.Windows.Forms.Padding(0);
             this.label40.Name = "label40";
             this.label40.Size = new System.Drawing.Size(80, 27);
@@ -2293,7 +2293,7 @@
             this.label41.BackColor = System.Drawing.Color.Gainsboro;
             this.label41.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label41.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label41.Location = new System.Drawing.Point(1116, 1);
+            this.label41.Location = new System.Drawing.Point(1111, 1);
             this.label41.Margin = new System.Windows.Forms.Padding(0);
             this.label41.Name = "label41";
             this.label41.Size = new System.Drawing.Size(80, 27);
@@ -2305,9 +2305,9 @@
             // 
             this.lbcnt5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbcnt5.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbcnt5.Location = new System.Drawing.Point(977, 1);
+            this.lbcnt5.Location = new System.Drawing.Point(973, 1);
             this.lbcnt5.Name = "lbcnt5";
-            this.lbcnt5.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt5.Size = new System.Drawing.Size(134, 27);
             this.lbcnt5.TabIndex = 1;
             this.lbcnt5.Text = "000";
             this.lbcnt5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2316,9 +2316,9 @@
             // 
             this.lbcnt6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbcnt6.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbcnt6.Location = new System.Drawing.Point(1200, 1);
+            this.lbcnt6.Location = new System.Drawing.Point(1195, 1);
             this.lbcnt6.Name = "lbcnt6";
-            this.lbcnt6.Size = new System.Drawing.Size(135, 27);
+            this.lbcnt6.Size = new System.Drawing.Size(140, 27);
             this.lbcnt6.TabIndex = 1;
             this.lbcnt6.Text = "000";
             this.lbcnt6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs
index 1635312..c0848ea 100644
--- a/SubProject/FPJ0000/Project/fProjectList.cs
+++ b/SubProject/FPJ0000/Project/fProjectList.cs
@@ -77,6 +77,7 @@ namespace FPJ0000
                 "검토기한",
                 "만료일자",
                 "업데이트",
+                "완료일자",
             });
 
             chk검토_CheckedChanged(this.chk검토, null);
@@ -836,6 +837,9 @@ namespace FPJ0000
                 case 13: //업데이트
                     this.bs.Sort = "lasthistory_date";
                     break;
+                case 14: //완료일자
+                    this.bs.Sort = "edate desc";
+                    break;
                 default:
                     this.bs.Sort = "";
                     break;
diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx
index 2940841..6d932e7 100644
--- a/SubProject/FPJ0000/Project/fProjectList.resx
+++ b/SubProject/FPJ0000/Project/fProjectList.resx
@@ -290,6 +290,9 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>387, 17</value>
   </metadata>
@@ -347,6 +350,12 @@
   <metadata name="bsHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>934, 17</value>
   </metadata>
+  <metadata name="bsHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>934, 17</value>
+  </metadata>
+  <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>561, 17</value>
+  </metadata>
   <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>561, 17</value>
   </metadata>
@@ -356,6 +365,9 @@
   <metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>647, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>731, 17</value>
+  </metadata>
   <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>828, 17</value>
   </metadata>
diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs
index bce2130..a7930ed 100644
--- a/SubProject/FPJ0000/dsReport.Designer.cs
+++ b/SubProject/FPJ0000/dsReport.Designer.cs
@@ -8808,7 +8808,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
@@ -8820,6 +8820,17 @@ ORDER BY pdate";
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[1].Connection = this.Connection;
+            this._commandCollection[1].CommandText = @"SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
+FROM     vJobReportForUser
+WHERE  (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
+ORDER BY pdate";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ed", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userProcess", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8893,6 +8904,78 @@ ORDER BY pdate";
             this.Adapter.Fill(dataTable);
             return dataTable;
         }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
+        public virtual int FillByProcess(dsReport.vJobReportForUserDataTable dataTable, string gcode, string sd, string ed, string userprocess) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((sd == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
+            }
+            if ((ed == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
+            }
+            if ((userprocess == null)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(userprocess));
+            }
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual dsReport.vJobReportForUserDataTable GetByProcess(string gcode, string sd, string ed, string userprocess) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((sd == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(sd));
+            }
+            if ((ed == null)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(ed));
+            }
+            if ((userprocess == null)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(userprocess));
+            }
+            dsReport.vJobReportForUserDataTable dataTable = new dsReport.vJobReportForUserDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
     }
     
     /// <summary>
diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd
index 5a0f6d6..dbdb335 100644
--- a/SubProject/FPJ0000/dsReport.xsd
+++ b/SubProject/FPJ0000/dsReport.xsd
@@ -292,7 +292,24 @@ ORDER BY pdate</CommandText>
               <Mapping SourceColumn="ot2" DataSetColumn="ot2" />
               <Mapping SourceColumn="otReason" DataSetColumn="otReason" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="FillByProcess" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByProcess" GeneratorSourceName="FillByProcess" GetMethodModifier="Public" GetMethodName="GetByProcess" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByProcess" UserSourceName="FillByProcess">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason
+FROM     vJobReportForUser
+WHERE  (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (userProcess = @userprocess)
+ORDER BY pdate</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="pdate" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="pdate" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userProcess" DataSourceName="EE.dbo.vJobReportForUser" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userProcess" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobProjectTimesTableAdapter" GeneratorDataComponentClassName="JobProjectTimesTableAdapter" Name="JobProjectTimes" UserDataComponentName="JobProjectTimesTableAdapter">
             <MainSource>
@@ -713,7 +730,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
                 </xs:simpleType>
               </xs:element>
               <xs:element name="hrs" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_UserColumnName="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" type="xs:double" minOccurs="0" />
-              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" minOccurs="0" />
+              <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="PrjStatus" msprop:Generator_ColumnPropNameInTable="PrjStatusColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjStatus" msprop:Generator_UserColumnName="PrjStatus" msprop:Generator_ColumnVarNameInTable="columnPrjStatus" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss
index 767a3d6..a78aa69 100644
--- a/SubProject/FPJ0000/dsReport.xss
+++ b/SubProject/FPJ0000/dsReport.xss
@@ -6,14 +6,14 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:jobReport" ZOrder="4" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:JobReportDay" ZOrder="1" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
+    <Shape ID="DesignTable:jobReport" ZOrder="5" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
     <Shape ID="DesignTable:ProcessList" ZOrder="10" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ProcessUserList" ZOrder="9" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
     <Shape ID="DesignTable:HolidayLIst" ZOrder="7" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vJobReportForUser" ZOrder="5" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:JobProjectTimes" ZOrder="3" X="624" Y="600" Height="267" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="199" />
-    <Shape ID="DesignTable:UserScheduleTable" ZOrder="2" X="0" Y="0" Height="305" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:JobProjectTimes" ZOrder="4" X="624" Y="600" Height="267" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="199" />
+    <Shape ID="DesignTable:UserScheduleTable" ZOrder="3" X="0" Y="0" Height="305" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:PartSummary" ZOrder="8" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:K5DailyForm" ZOrder="6" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
   </Shapes>