diff --git a/Project/Controller/APIController.cs b/Project/Controller/APIController.cs
new file mode 100644
index 0000000..be3c5ca
--- /dev/null
+++ b/Project/Controller/APIController.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+using Newtonsoft.Json;
+
+namespace Project
+{
+    public class APIController : BaseController
+    {
+        [HttpGet]
+        public HttpResponseMessage Getdata()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            var sql = string.Empty;
+            var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
+            if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
+            else
+            {
+                var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
+                var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
+                var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
+                var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
+                sql = "select * from {0} where gcode = '{gcode}'";
+                sql = string.Format(sql, p_table.Value, p_gcode.Value);
+                if (p_where.Key != null) sql += " and " + p_where.Value;
+                if (p_order.Key != null) sql += " order by " + p_order.Value;
+            }
+
+
+            if (FCOMMON.info.Login.gcode == null)
+                FCOMMON.info.Login.gcode = "EET1P";
+            sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
+
+            var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
+            var cn = new System.Data.SqlClient.SqlConnection(cs);
+            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            var dt = new System.Data.DataTable();
+            da.Fill(dt);
+            da.Dispose();
+            cmd.Dispose();
+            cn.Dispose();
+
+            var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            });
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+            txtjson,
+           System.Text.Encoding.UTF8,
+           "application/json")
+            };
+
+            return resp;
+
+
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Gettable()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            var sql = string.Empty;
+            var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
+            if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
+            else
+            {
+                var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
+                var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
+                var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
+                var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
+                sql = "select * from {0} where gcode = '{gcode}'";                
+                sql = string.Format(sql, p_table.Value, p_gcode.Value);
+                if (p_where.Key != null) sql += " and " + p_where.Value;
+                if (p_order.Key != null) sql += " order by " + p_order.Value;
+            }
+
+
+            if (FCOMMON.info.Login.gcode == null)
+                FCOMMON.info.Login.gcode = "EET1P";
+            sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
+
+            var cs = "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!";
+            var cn = new System.Data.SqlClient.SqlConnection(cs);
+            var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
+            var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+            var dt = new System.Data.DataTable();
+            da.Fill(dt);
+            da.Dispose();
+            cmd.Dispose();
+            cn.Dispose();
+
+            var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
+            {
+                NullValueHandling = NullValueHandling.Ignore
+            });
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+            txtjson,
+           System.Text.Encoding.UTF8,
+           "application/json")
+            };
+
+            return resp;
+
+
+        }
+
+
+
+        [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/JobreportController.cs b/Project/Controller/JobreportController.cs
index f2eeadf..5564438 100644
--- a/Project/Controller/JobreportController.cs
+++ b/Project/Controller/JobreportController.cs
@@ -254,6 +254,8 @@ namespace Project
                 }
             }
 
+
+
             //아잍쳄이 없는경우
             if (itemcnt == 0)
             {
diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj
index 45888fd..bf133cb 100644
--- a/Project/EETGW.csproj
+++ b/Project/EETGW.csproj
@@ -256,6 +256,7 @@
       <DependentUpon>AdoNetEFMain.edmx</DependentUpon>
     </Compile>
     <Compile Include="BaseController.cs" />
+    <Compile Include="Controller\APIController.cs" />
     <Compile Include="Controller\ProjectController.cs" />
     <Compile Include="Controller\JobreportController.cs" />
     <Compile Include="Controller\CustomerController.cs" />
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 05eac7a..81bd971 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.06.17.0920")]
-[assembly: AssemblyFileVersion("21.06.17.0920")]
+[assembly: AssemblyVersion("21.06.25.1400")]
+[assembly: AssemblyFileVersion("21.06.25.1400")]
diff --git a/Sub/YARTE/HtmlEditor.cs b/Sub/YARTE/HtmlEditor.cs
index 1411001..5bb4d0b 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;
 
 namespace YARTE.UI
diff --git a/Sub/YARTE/Properties/Resources.Designer.cs b/Sub/YARTE/Properties/Resources.Designer.cs
index ff66d06..d54f0b6 100644
--- a/Sub/YARTE/Properties/Resources.Designer.cs
+++ b/Sub/YARTE/Properties/Resources.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     이 코드는 도구를 사용하여 생성되었습니다.
+//     런타임 버전:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
+//     이러한 변경 내용이 손실됩니다.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace YARTE.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder
+    // 클래스에서 자동으로 생성되었습니다.
+    // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
+    // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -33,7 +33,7 @@ namespace YARTE.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace YARTE.Properties {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을
+        ///   재정의합니다.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -60,6 +60,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap bold {
             get {
                 object obj = ResourceManager.GetObject("bold", resourceCulture);
@@ -67,6 +70,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap bulletedlist {
             get {
                 object obj = ResourceManager.GetObject("bulletedlist", resourceCulture);
@@ -74,6 +80,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap copy {
             get {
                 object obj = ResourceManager.GetObject("copy", resourceCulture);
@@ -81,6 +90,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap createlink {
             get {
                 object obj = ResourceManager.GetObject("createlink", resourceCulture);
@@ -88,6 +100,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap cut {
             get {
                 object obj = ResourceManager.GetObject("cut", resourceCulture);
@@ -95,6 +110,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap delete {
             get {
                 object obj = ResourceManager.GetObject("delete", resourceCulture);
@@ -102,6 +120,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap deletetablecolumn {
             get {
                 object obj = ResourceManager.GetObject("deletetablecolumn", resourceCulture);
@@ -109,6 +130,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap deletetablerow {
             get {
                 object obj = ResourceManager.GetObject("deletetablerow", resourceCulture);
@@ -116,6 +140,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap editstyle {
             get {
                 object obj = ResourceManager.GetObject("editstyle", resourceCulture);
@@ -123,6 +150,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap edittable {
             get {
                 object obj = ResourceManager.GetObject("edittable", resourceCulture);
@@ -130,6 +160,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap fontbackcolorpicker {
             get {
                 object obj = ResourceManager.GetObject("fontbackcolorpicker", resourceCulture);
@@ -137,6 +170,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap fontforecolorpicker {
             get {
                 object obj = ResourceManager.GetObject("fontforecolorpicker", resourceCulture);
@@ -144,6 +180,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap iespellcheck {
             get {
                 object obj = ResourceManager.GetObject("iespellcheck", resourceCulture);
@@ -151,6 +190,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap indent {
             get {
                 object obj = ResourceManager.GetObject("indent", resourceCulture);
@@ -158,6 +200,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertbutton {
             get {
                 object obj = ResourceManager.GetObject("insertbutton", resourceCulture);
@@ -165,6 +210,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertcheckbox {
             get {
                 object obj = ResourceManager.GetObject("insertcheckbox", resourceCulture);
@@ -172,6 +220,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertdate {
             get {
                 object obj = ResourceManager.GetObject("insertdate", resourceCulture);
@@ -179,6 +230,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertdiv {
             get {
                 object obj = ResourceManager.GetObject("insertdiv", resourceCulture);
@@ -186,6 +240,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertdropdownlist {
             get {
                 object obj = ResourceManager.GetObject("insertdropdownlist", resourceCulture);
@@ -193,6 +250,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertform {
             get {
                 object obj = ResourceManager.GetObject("insertform", resourceCulture);
@@ -200,6 +260,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertimage {
             get {
                 object obj = ResourceManager.GetObject("insertimage", resourceCulture);
@@ -207,6 +270,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertimagefromgallery {
             get {
                 object obj = ResourceManager.GetObject("insertimagefromgallery", resourceCulture);
@@ -214,6 +280,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertradiobutton {
             get {
                 object obj = ResourceManager.GetObject("insertradiobutton", resourceCulture);
@@ -221,6 +290,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap insertrule {
             get {
                 object obj = ResourceManager.GetObject("insertrule", resourceCulture);
@@ -228,6 +300,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttable {
             get {
                 object obj = ResourceManager.GetObject("inserttable", resourceCulture);
@@ -235,6 +310,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttablecolumnafter {
             get {
                 object obj = ResourceManager.GetObject("inserttablecolumnafter", resourceCulture);
@@ -242,6 +320,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttablecolumnbefore {
             get {
                 object obj = ResourceManager.GetObject("inserttablecolumnbefore", resourceCulture);
@@ -249,6 +330,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttablerowafter {
             get {
                 object obj = ResourceManager.GetObject("inserttablerowafter", resourceCulture);
@@ -256,6 +340,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttablerowbefore {
             get {
                 object obj = ResourceManager.GetObject("inserttablerowbefore", resourceCulture);
@@ -263,6 +350,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttextarea {
             get {
                 object obj = ResourceManager.GetObject("inserttextarea", resourceCulture);
@@ -270,6 +360,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttextbox {
             get {
                 object obj = ResourceManager.GetObject("inserttextbox", resourceCulture);
@@ -277,6 +370,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap inserttime {
             get {
                 object obj = ResourceManager.GetObject("inserttime", resourceCulture);
@@ -284,6 +380,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap italic {
             get {
                 object obj = ResourceManager.GetObject("italic", resourceCulture);
@@ -291,6 +390,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap justifycenter {
             get {
                 object obj = ResourceManager.GetObject("justifycenter", resourceCulture);
@@ -298,6 +400,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap justifyfull {
             get {
                 object obj = ResourceManager.GetObject("justifyfull", resourceCulture);
@@ -305,6 +410,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap justifyleft {
             get {
                 object obj = ResourceManager.GetObject("justifyleft", resourceCulture);
@@ -312,6 +420,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap justifyright {
             get {
                 object obj = ResourceManager.GetObject("justifyright", resourceCulture);
@@ -319,6 +430,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap netspell {
             get {
                 object obj = ResourceManager.GetObject("netspell", resourceCulture);
@@ -326,6 +440,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap numberedlist {
             get {
                 object obj = ResourceManager.GetObject("numberedlist", resourceCulture);
@@ -333,6 +450,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap outdent {
             get {
                 object obj = ResourceManager.GetObject("outdent", resourceCulture);
@@ -340,6 +460,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap paste {
             get {
                 object obj = ResourceManager.GetObject("paste", resourceCulture);
@@ -347,6 +470,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap preview {
             get {
                 object obj = ResourceManager.GetObject("preview", resourceCulture);
@@ -354,6 +480,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap print {
             get {
                 object obj = ResourceManager.GetObject("print", resourceCulture);
@@ -361,6 +490,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap redo {
             get {
                 object obj = ResourceManager.GetObject("redo", resourceCulture);
@@ -368,6 +500,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap removeformat {
             get {
                 object obj = ResourceManager.GetObject("removeformat", resourceCulture);
@@ -375,6 +510,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap save {
             get {
                 object obj = ResourceManager.GetObject("save", resourceCulture);
@@ -382,6 +520,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap selectall {
             get {
                 object obj = ResourceManager.GetObject("selectall", resourceCulture);
@@ -389,6 +530,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap strikethrough {
             get {
                 object obj = ResourceManager.GetObject("strikethrough", resourceCulture);
@@ -396,6 +540,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap subscript {
             get {
                 object obj = ResourceManager.GetObject("subscript", resourceCulture);
@@ -403,6 +550,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap superscript {
             get {
                 object obj = ResourceManager.GetObject("superscript", resourceCulture);
@@ -410,6 +560,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap underline {
             get {
                 object obj = ResourceManager.GetObject("underline", resourceCulture);
@@ -417,6 +570,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap undo {
             get {
                 object obj = ResourceManager.GetObject("undo", resourceCulture);
@@ -424,6 +580,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap unlink {
             get {
                 object obj = ResourceManager.GetObject("unlink", resourceCulture);
@@ -431,6 +590,9 @@ namespace YARTE.Properties {
             }
         }
         
+        /// <summary>
+        ///   System.Drawing.Bitmap 형식의 지역화된 리소스를 찾습니다.
+        /// </summary>
         internal static System.Drawing.Bitmap wordclean {
             get {
                 object obj = ResourceManager.GetObject("wordclean", resourceCulture);
diff --git a/Sub/YARTE/YARTE.csproj b/Sub/YARTE/YARTE.csproj
index 54fb36f..9b62583 100644
--- a/Sub/YARTE/YARTE.csproj
+++ b/Sub/YARTE/YARTE.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YARTE</RootNamespace>
     <AssemblyName>YARTE</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -82,17 +83,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>
@@ -255,6 +245,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/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj
index a2e7a7b..cdfc331 100644
--- a/SubProject/FCM0000/FCM0000.csproj
+++ b/SubProject/FCM0000/FCM0000.csproj
@@ -33,7 +33,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\..\Amkor\GroupWare\</OutputPath>
+    <OutputPath>bin\debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs
index 7233e0c..0173b8c 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReport.Designer.cs
@@ -32,8 +32,9 @@
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsReport = new FPJ0000.dsReport();
             this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.dataGridView1 = new arCtl.arDatagridView();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
             this.tbProcess = new System.Windows.Forms.ComboBox();
             this.label1 = new System.Windows.Forms.Label();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
@@ -61,6 +62,11 @@
             // 
             // dataGridView1
             // 
+            this.dataGridView1.A_DelCurrentCell = true;
+            this.dataGridView1.A_EnterToTab = true;
+            this.dataGridView1.A_KoreanField = null;
+            this.dataGridView1.A_UpperField = null;
+            this.dataGridView1.A_ViewRownumOnHeader = true;
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -69,11 +75,12 @@
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(721, 544);
+            this.dataGridView1.Size = new System.Drawing.Size(1003, 534);
             this.dataGridView1.TabIndex = 2;
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.button1);
             this.panel1.Controls.Add(this.tbProcess);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.linkLabel1);
@@ -83,9 +90,20 @@
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Padding = new System.Windows.Forms.Padding(5);
-            this.panel1.Size = new System.Drawing.Size(721, 42);
+            this.panel1.Size = new System.Drawing.Size(1003, 42);
             this.panel1.TabIndex = 3;
             // 
+            // button1
+            // 
+            this.button1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.button1.Location = new System.Drawing.Point(848, 5);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 32);
+            this.button1.TabIndex = 8;
+            this.button1.Text = "내보내기";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
             // tbProcess
             // 
             this.tbProcess.FormattingEnabled = true;
@@ -117,7 +135,7 @@
             // btRefresh
             // 
             this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btRefresh.Location = new System.Drawing.Point(641, 5);
+            this.btRefresh.Location = new System.Drawing.Point(923, 5);
             this.btRefresh.Name = "btRefresh";
             this.btRefresh.Size = new System.Drawing.Size(75, 32);
             this.btRefresh.TabIndex = 2;
@@ -138,7 +156,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(721, 586);
+            this.ClientSize = new System.Drawing.Size(1003, 576);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.panel1);
             this.Name = "rJobReport";
@@ -157,12 +175,13 @@
         private System.Windows.Forms.BindingSource bs;
         private dsReport dsReport;
         private dsReportTableAdapters.jobReportTableAdapter ta;
-        private System.Windows.Forms.DataGridView dataGridView1;
+        private arCtl.arDatagridView dataGridView1;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.LinkLabel linkLabel1;
         private System.Windows.Forms.Button btRefresh;
         private System.Windows.Forms.TextBox tbMon;
         private System.Windows.Forms.ComboBox tbProcess;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button button1;
     }
 }
\ No newline at end of file
diff --git a/SubProject/FPJ0000/JobReport_/rJobReport.cs b/SubProject/FPJ0000/JobReport_/rJobReport.cs
index 0ddbc06..dd98665 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReport.cs
@@ -36,6 +36,14 @@ namespace FPJ0000.JobReport_
 
         void refrehData()
         {
+
+
+
+
+            ////휴일데이터가 들어가 있음.
+            //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
+            //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
+
             string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
             this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
             //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
@@ -87,13 +95,27 @@ namespace FPJ0000.JobReport_
                     }
                     else
                     {
+                        ////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
+                        //var sumhr = 0f;
+                        //var sumot = 0f;
+                        //var sumholy = 0f;
+                        //foreach(dsReport.jobReportRow item in userDatas)
+                        //{
+                        //    dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
+                        //}
+
+                        
+
                         var sumhr = userDatas.Sum(t => t.hrs);
                         var sumot = userDatas.Sum(t => t.ot);
+                        var sumhl = userDatas.Sum(t => t.holyot);
                         if (sumot == 0) rowdata.Add(string.Format("{0}", sumhr, sumot));
-                        else rowdata.Add(string.Format("{0}+{1}", sumhr, sumot));
+
+                        else rowdata.Add(string.Format("{0}+{1}(*{2})", sumhr, sumot,sumhl));
 
                         if (sumhr > basehr) high.Add(true);
                         else high.Add(false);
+
                         if (sumhr < basehr) low.Add(true);
                         else low.Add(false);
                     }
@@ -123,5 +145,10 @@ namespace FPJ0000.JobReport_
         {
             if (tbProcess.SelectedIndex >= 0) refrehData();
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            dataGridView1.ExportData(string.Empty);
+        }
     }
 }
diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs
index db77bea..8a3fd5e 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs
@@ -32,13 +32,14 @@
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsReport = new FPJ0000.dsReport();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
             this.tbProcess = new System.Windows.Forms.ComboBox();
             this.label1 = new System.Windows.Forms.Label();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.btRefresh = new System.Windows.Forms.Button();
             this.tbMon = new System.Windows.Forms.TextBox();
             this.ta = new FPJ0000.dsReportTableAdapters.JobReportDayTableAdapter();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.dataGridView1 = new arCtl.arDatagridView();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             this.panel1.SuspendLayout();
@@ -57,6 +58,7 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.button1);
             this.panel1.Controls.Add(this.tbProcess);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.linkLabel1);
@@ -66,9 +68,20 @@
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
             this.panel1.Padding = new System.Windows.Forms.Padding(5);
-            this.panel1.Size = new System.Drawing.Size(751, 42);
+            this.panel1.Size = new System.Drawing.Size(1041, 42);
             this.panel1.TabIndex = 0;
             // 
+            // button1
+            // 
+            this.button1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.button1.Location = new System.Drawing.Point(886, 5);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 32);
+            this.button1.TabIndex = 6;
+            this.button1.Text = "내보내기";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click_1);
+            // 
             // tbProcess
             // 
             this.tbProcess.FormattingEnabled = true;
@@ -101,7 +114,7 @@
             // btRefresh
             // 
             this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btRefresh.Location = new System.Drawing.Point(671, 5);
+            this.btRefresh.Location = new System.Drawing.Point(961, 5);
             this.btRefresh.Name = "btRefresh";
             this.btRefresh.Size = new System.Drawing.Size(75, 32);
             this.btRefresh.TabIndex = 2;
@@ -123,19 +136,27 @@
             // 
             // dataGridView1
             // 
+            this.dataGridView1.A_DelCurrentCell = true;
+            this.dataGridView1.A_EnterToTab = true;
+            this.dataGridView1.A_KoreanField = null;
+            this.dataGridView1.A_UpperField = null;
+            this.dataGridView1.A_ViewRownumOnHeader = true;
+            this.dataGridView1.AllowUserToAddRows = false;
+            this.dataGridView1.AllowUserToDeleteRows = false;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView1.Location = new System.Drawing.Point(0, 42);
             this.dataGridView1.Name = "dataGridView1";
+            this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(751, 546);
+            this.dataGridView1.Size = new System.Drawing.Size(1041, 586);
             this.dataGridView1.TabIndex = 1;
             // 
             // rJobReportDay
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(751, 588);
+            this.ClientSize = new System.Drawing.Size(1041, 628);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.panel1);
             this.Name = "rJobReportDay";
@@ -160,6 +181,7 @@
         private dsReportTableAdapters.JobReportDayTableAdapter ta;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox tbProcess;
-        private System.Windows.Forms.DataGridView dataGridView1;
+        private arCtl.arDatagridView dataGridView1;
+        private System.Windows.Forms.Button button1;
     }
 }
\ No newline at end of file
diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs
index ee54c76..190e82a 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs
+++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs
@@ -135,8 +135,9 @@ namespace FPJ0000.JobReport_
                         if (col.Tag.ToString() == "1")
                         {
                             //이날은 휴일이다
-                            sumFR += daydata.ot + daydata.hrs;
-                            rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
+                            sumFR += daydata.ot;// + daydata.hrs;
+                            //sumOT += daydata.ot;
+                             rowdata.Add("*" + daydata.hrs.ToString() + "+" + daydata.ot.ToString());
                         }
                         else
                         {
@@ -147,7 +148,7 @@ namespace FPJ0000.JobReport_
                     }
                     else rowdata.Add("--");
                 }
-                rowdata.Add(sum.ToString() + "+" + sumOT.ToString());
+                rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
                 this.dataGridView1.Rows.Add(rowdata.ToArray());
             }
             foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
@@ -205,5 +206,10 @@ namespace FPJ0000.JobReport_
         {
             if (tbProcess.SelectedIndex >= 0) refrehData();
         }
+
+        private void button1_Click_1(object sender, EventArgs e)
+        {
+            dataGridView1.ExportData(string.Empty);
+        }
     }
 }
diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx
index b0616c3..d42e47f 100644
--- a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx
+++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx
@@ -123,9 +123,6 @@
   <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>245, 17</value>
   </metadata>
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs
index 1bfad62..bad7c10 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs
@@ -117,13 +117,13 @@
             this.taPartStatus = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel4 = new System.Windows.Forms.Panel();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.textBox5 = new System.Windows.Forms.TextBox();
+            this.tbProjectName = new System.Windows.Forms.TextBox();
+            this.tbProjectIdx = new System.Windows.Forms.TextBox();
             this.tbDue = new System.Windows.Forms.TextBox();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
-            this.textBox3 = new System.Windows.Forms.TextBox();
-            this.pdateTextBox = new System.Windows.Forms.TextBox();
-            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.tbOrderNo = new System.Windows.Forms.TextBox();
+            this.tbPDate = new System.Windows.Forms.TextBox();
+            this.tbStatus = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             pdateLabel = new System.Windows.Forms.Label();
             label3 = new System.Windows.Forms.Label();
@@ -1012,7 +1012,6 @@
             this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
             this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amt";
             this.fpSpread1_Sheet1.Columns.Get(12).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-3]*RC[-2]";
             this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(12).Label = "1대 금액";
             this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amt";
@@ -1021,7 +1020,6 @@
             this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9;
             this.fpSpread1_Sheet1.Columns.Get(13).DataField = "amtn";
             this.fpSpread1_Sheet1.Columns.Get(13).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[-4]*RC[-2]";
             this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
             this.fpSpread1_Sheet1.Columns.Get(13).Label = "N대 금액";
             this.fpSpread1_Sheet1.Columns.Get(13).Tag = "amtn";
@@ -1139,16 +1137,16 @@
             // 
             // panel4
             // 
-            this.panel4.Controls.Add(this.textBox1);
-            this.panel4.Controls.Add(this.textBox5);
+            this.panel4.Controls.Add(this.tbProjectName);
+            this.panel4.Controls.Add(this.tbProjectIdx);
             this.panel4.Controls.Add(this.tbDue);
             this.panel4.Controls.Add(this.linkLabel1);
-            this.panel4.Controls.Add(this.textBox3);
+            this.panel4.Controls.Add(this.tbOrderNo);
             this.panel4.Controls.Add(label3);
             this.panel4.Controls.Add(label5);
-            this.panel4.Controls.Add(this.pdateTextBox);
+            this.panel4.Controls.Add(this.tbPDate);
             this.panel4.Controls.Add(pdateLabel);
-            this.panel4.Controls.Add(this.textBox4);
+            this.panel4.Controls.Add(this.tbStatus);
             this.panel4.Controls.Add(label4);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel4.Location = new System.Drawing.Point(0, 24);
@@ -1157,26 +1155,26 @@
             this.panel4.Size = new System.Drawing.Size(1345, 31);
             this.panel4.TabIndex = 8;
             // 
-            // textBox1
+            // tbProjectName
             // 
-            this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
-            this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.textBox1.Location = new System.Drawing.Point(768, 5);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(572, 21);
-            this.textBox1.TabIndex = 3;
-            this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbProjectName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true));
+            this.tbProjectName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tbProjectName.Location = new System.Drawing.Point(768, 5);
+            this.tbProjectName.Name = "tbProjectName";
+            this.tbProjectName.Size = new System.Drawing.Size(572, 21);
+            this.tbProjectName.TabIndex = 3;
+            this.tbProjectName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // textBox5
+            // tbProjectIdx
             // 
-            this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
-            this.textBox5.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textBox5.Location = new System.Drawing.Point(714, 5);
-            this.textBox5.Name = "textBox5";
-            this.textBox5.ReadOnly = true;
-            this.textBox5.Size = new System.Drawing.Size(54, 21);
-            this.textBox5.TabIndex = 9;
-            this.textBox5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbProjectIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true));
+            this.tbProjectIdx.Dock = System.Windows.Forms.DockStyle.Left;
+            this.tbProjectIdx.Location = new System.Drawing.Point(714, 5);
+            this.tbProjectIdx.Name = "tbProjectIdx";
+            this.tbProjectIdx.ReadOnly = true;
+            this.tbProjectIdx.Size = new System.Drawing.Size(54, 21);
+            this.tbProjectIdx.TabIndex = 9;
+            this.tbProjectIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // tbDue
             // 
@@ -1201,35 +1199,35 @@
             this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
             // 
-            // textBox3
+            // tbOrderNo
             // 
-            this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
-            this.textBox3.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textBox3.Location = new System.Drawing.Point(345, 5);
-            this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(177, 21);
-            this.textBox3.TabIndex = 5;
-            this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbOrderNo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true));
+            this.tbOrderNo.Dock = System.Windows.Forms.DockStyle.Left;
+            this.tbOrderNo.Location = new System.Drawing.Point(345, 5);
+            this.tbOrderNo.Name = "tbOrderNo";
+            this.tbOrderNo.Size = new System.Drawing.Size(177, 21);
+            this.tbOrderNo.TabIndex = 5;
+            this.tbOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // pdateTextBox
+            // tbPDate
             // 
-            this.pdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
-            this.pdateTextBox.Dock = System.Windows.Forms.DockStyle.Left;
-            this.pdateTextBox.Location = new System.Drawing.Point(193, 5);
-            this.pdateTextBox.Name = "pdateTextBox";
-            this.pdateTextBox.Size = new System.Drawing.Size(100, 21);
-            this.pdateTextBox.TabIndex = 1;
-            this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbPDate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true));
+            this.tbPDate.Dock = System.Windows.Forms.DockStyle.Left;
+            this.tbPDate.Location = new System.Drawing.Point(193, 5);
+            this.tbPDate.Name = "tbPDate";
+            this.tbPDate.Size = new System.Drawing.Size(100, 21);
+            this.tbPDate.TabIndex = 1;
+            this.tbPDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // textBox4
+            // tbStatus
             // 
-            this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
-            this.textBox4.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textBox4.Location = new System.Drawing.Point(49, 5);
-            this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(100, 21);
-            this.textBox4.TabIndex = 7;
-            this.textBox4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbStatus.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true));
+            this.tbStatus.Dock = System.Windows.Forms.DockStyle.Left;
+            this.tbStatus.Location = new System.Drawing.Point(49, 5);
+            this.tbStatus.Name = "tbStatus";
+            this.tbStatus.Size = new System.Drawing.Size(100, 21);
+            this.tbStatus.TabIndex = 7;
+            this.tbStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // label1
             // 
@@ -1323,13 +1321,13 @@
         private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPartStatus;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Panel panel3;
-        private System.Windows.Forms.TextBox pdateTextBox;
+        private System.Windows.Forms.TextBox tbPDate;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox textBox1;
-        private System.Windows.Forms.TextBox textBox3;
-        private System.Windows.Forms.TextBox textBox4;
+        private System.Windows.Forms.TextBox tbProjectName;
+        private System.Windows.Forms.TextBox tbOrderNo;
+        private System.Windows.Forms.TextBox tbStatus;
         private System.Windows.Forms.Panel panel4;
-        private System.Windows.Forms.TextBox textBox5;
+        private System.Windows.Forms.TextBox tbProjectIdx;
         private System.Windows.Forms.TextBox tbDue;
         private System.Windows.Forms.LinkLabel linkLabel1;
         private arCtl.arLabel prb4;
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
index a125351..ef9a709 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
@@ -39,6 +39,19 @@ namespace FPJ0000
             this.FormClosed += fPartList_FormClosed;
             this.FormClosing += FPartList_FormClosing;
             this.KeyDown += fPartList_KeyDown;
+            this.dsPRJ.ProjectPartStatus.ColumnChanged += ProjectPartStatus_ColumnChanged;
+            this.dsPRJ.ProjectPartStatus.RowChanged += ProjectPartStatus_RowChanged;
+        }
+
+        private void ProjectPartStatus_RowChanged(object sender, DataRowChangeEventArgs e)
+        {
+            //if (e.Action == DataRowAction.Add || ) return;
+            //Console.WriteLine("d");
+        }
+
+        private void ProjectPartStatus_ColumnChanged(object sender, DataColumnChangeEventArgs e)
+        {
+         
         }
 
         private void FPartList_FormClosing(object sender, FormClosingEventArgs e)
@@ -96,7 +109,8 @@ namespace FPJ0000
         string sortkey = string.Empty;
         void RefreshData()
         {
-            if (dsPRJ.HasChanges())
+            var changes = dsPRJ.ProjectPartStatus.GetChanges();
+            if (changes != null && changes.Rows.Count > 0)
             {
                 var dlg = FCOMMON.Util.MsgQ("변경 사항이 있습니다. 갱신하면 변경 내용이 손실 됩니다.\n지금 갱신 하겠습니까?");
                 if (dlg != System.Windows.Forms.DialogResult.Yes) return;
@@ -127,9 +141,10 @@ namespace FPJ0000
             //    }
             //}
             //this.dsPRJ.AcceptChanges();
-            RefreshSum();
+            //RefreshSum();
             FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
             FormattingData();
+            dsPRJ.ProjectPartStatus.AcceptChanges();
         }
         void FormattingData()
         {
@@ -287,14 +302,12 @@ namespace FPJ0000
             this.fpSpread1.ResumeLayout();
         }
 
-        void RefreshSum()
-        {
-            decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
-            decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
-
-
-            //lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
-        }
+        //void RefreshSum()
+        //{
+        //    decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
+        //    decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
+        //    //lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
+        //}
 
 
         private void toolStripButton1_Click(object sender, EventArgs e)
@@ -488,7 +501,7 @@ namespace FPJ0000
                     var amt = iQty1 * iPrice1;
                     fpSpread1.ActiveSheet.Cells[Rowidx, colidx_amt].Value = amt;
                     //dv1.Rows[e.RowIndex].Cells["dvc_amt"].Value = amt;
-                    RefreshSum();
+                    //RefreshSum();
                     break;
 
             }
@@ -861,7 +874,7 @@ namespace FPJ0000
                 if (dlg == DialogResult.Yes)
                 {
                     var taprj = new dsPRJTableAdapters.ProjectsTableAdapter();
-                    var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(textBox5.Text), FCOMMON.info.Login.gcode);
+                    var cnt = taprj.UpdateCRDue(sd.ToShortDateString(), int.Parse(tbProjectIdx.Text), FCOMMON.info.Login.gcode);
                     if (cnt != 1)
                     {
                         FCOMMON.Util.MsgE($"적용실패 {cnt}건의 자료가 업데이트 됨");
@@ -875,6 +888,14 @@ namespace FPJ0000
             var drv = this.bsPart.Current as DataRowView;
             if (drv == null) return;
             var dr = drv.Row as dsPRJ.ProjectPartStatusRow;
+
+            //tbDue.Text = dr.crdue;
+            //tbProjectIdx.Text = dr.Project.ToString();
+            //tbProjectName.Text = dr.name;
+            //tbOrderNo.Text = dr.orderno;
+            //tbPDate.Text = dr.pdate;
+            //tbStatus.Text = dr.status;
+
             if (dr.crdue.isEmpty() == false)
             {
                 DateTime dt;
diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
index c5a3a4e..52cf15c 100644
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -332,19 +332,19 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY
-        zVTMvM0pmprowiBbTCNTF5o4oUKUohcV2kWnNnXOOd1wRuYytTl1XsDLUnc5x+1Mvz3nbKmB0A8+PC+e
-        8/1wft9zeOyE3VcnX6rQKaMrdb/DJTqKnDSHjD31dHTFAB35RGs8K9ZUB8S83ceFdk/Eoz7Nko1eMRqN
-        HqtjA1b7Dis2Fho/F2wo/mRBfOWYU5Cj2O+LeieqTLvEhgem3dDPMNBbGOimGWinXFD/2kD7qAMbDNAy
-        RqH4wwzSnhmpfyThknZq3enC0KwHX2cZcjIY5CQu9Jo28GXUSQSbGFrwQD/vRqnCgpB73W+4cJws2HxD
-        ErMlkl9DWu111HY0oqRJhhBJIIIJgtIzCJOeRFVLFbeKnWawuOpEWFIvwwliK0Led4+0onXiJWp1hZwk
-        qSYSha8TkdsYD2HdZaTWpaJleBGtRjs+f1/HGukpXNpHcwJBtWB/gCTPoxvvwasRKcrVOZwkWR5FwleQ
-        +TwDGpODW6VrgoKS9LDqcCO8pN8rYCeirJfOr0+BwaRFnf4uHncWIE52Ack1MTBMO2EgxbIFaya9nViJ
-        IEy6S3DugcR9qugwEqsFGJocQGlPFqSKfMQ/DUWj+iO+zTEwkGIHptzoJyzZ3Ah56BMcF/uJ+OJDyG1I
-        wE15BBKqLnKSfEUixE0Z5E1Cwd4PWTwYZD8xwUaKDMrTegV88YE5vvggecgP/EI/XC0PRfaLFGhGlShV
-        FiHrXQqE8lgYiEBP/g0dEdDuTSJQ76xwPq+PXlijMTzn4egdn8ed+kykk6CoLh4FDbe371icLg8RNO8I
-        WNusdUfwPxzsChm7BKfzVc5yecPWXg/vhUql2jya1GL3xUmRmZ3mmXWnjb0wL1MwL1Ew+Vi2uznY5u20
-        N0xR1Jr/rbYfvjiPdyKzIztI2N55TKS0Boma6W3SvQT+RdhM+wvbVo+ktnUFpijSeDwe7w/xnZ33IE8q
-        nQAAAABJRU5ErkJggg==
+        zVTMdDqnaGpDFwbZYhqal9BEB11EKXpRoV10alPnnNMNZ2QuU5vzLnhZ6i7n6M7023POlhoI/eDD8+I5
+        3w/n9z2Hx07IfU3ipVK9KrJM/ztUpqfISXOUs6eBjizto8Mf60xnpdpKv6i3+7jQ7gl71KNdtNHLJpPJ
+        bXWsw2rfYdnGQuPnvA35n6YRWzbiFGQq93ujnoko1i2y4b5JFwxTDAzTDPSTDHQTG9D8WkfrsAPrDNA0
+        QiH/wxSSn5qofyShslZqzbmBgRk3vs4w5GTQz0k20G1ex5dhJxFsYmDeDcOcC4XKaQTd63zDhWPKAy03
+        ZFFb4pprSK6+juq2ehQ0lCNI5o9AgqDwDELkJ1HRVMGtYqcZLKw4EZLQzXCC6NKg951DzWgee4FqfS4n
+        SagKR+7reGTVx0KkuIwkRRKaBhfQbLLj8/c1rJKeQuU9NCcQVAr2+8my3frRLrwakqNEk8lJEmsiSPgK
+        0p6lQmt2cKt0jFFQkR5WHC6EFvR6BOyEFXfTklohjGYdFIa7KGrPQUz5BSRWRcE46YSRFMsWrB33dGIl
+        ghD5LsG5BzLXqbzDiK8UYGC8D4Vd6ZArJYh9Eox6zUd8m2VgJMX2TbjQS1i0uRD00Cs4LvUR86WHkFUX
+        h5s1YYiruMhJJMp4SBtSyZsEg70fmHajn/3EBBspMiBb5xHwpQdm+dKD5CEf8HN9cLUkGBnPhdAOq1Co
+        ykP6OyFENdEwEoGB/Bt6IqBdm0Sg2VnhfHYPPb9KY3DWzdE9Ooc7tWlIIUGxIhY5dbe371icG24iaNwR
+        sLYZ647gfzjYFVJ3CU5L1M6iqpdbez28F2q1evNoQpPdGydFprVbptacNvbCskTBskjB7GXJ7uJgm7fT
+        njBFUau+t1p+eOM83om0towAUWv7MbHKGiBupLdJ8eD/F1Ej7StqWTmS1NLhL1Qm83g83h/rHJ3uwC6N
+        XgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs
index ecf862f..e938cad 100644
--- a/SubProject/FPJ0000/dsReport.Designer.cs
+++ b/SubProject/FPJ0000/dsReport.Designer.cs
@@ -538,6 +538,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnUserProcess;
             
+            private global::System.Data.DataColumn columnholyot;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public jobReportDataTable() {
@@ -627,6 +629,14 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn holyotColumn {
+                get {
+                    return this.columnholyot;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -664,7 +674,7 @@ namespace FPJ0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess) {
+            public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess, double holyot) {
                 jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         yymm,
@@ -673,7 +683,8 @@ namespace FPJ0000 {
                         uname,
                         hrs,
                         ot,
-                        UserProcess};
+                        UserProcess,
+                        holyot};
                 rowjobReportRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowjobReportRow);
                 return rowjobReportRow;
@@ -711,6 +722,7 @@ namespace FPJ0000 {
                 this.columnhrs = base.Columns["hrs"];
                 this.columnot = base.Columns["ot"];
                 this.columnUserProcess = base.Columns["UserProcess"];
+                this.columnholyot = base.Columns["holyot"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -730,6 +742,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnot);
                 this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnUserProcess);
+                this.columnholyot = new global::System.Data.DataColumn("holyot", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnholyot);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnyymm,
                                 this.columnuid}, true));
@@ -3400,6 +3414,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public double holyot {
+                get {
+                    if (this.IsholyotNull()) {
+                        return 0D;
+                    }
+                    else {
+                        return ((double)(this[this.tablejobReport.holyotColumn]));
+                    }
+                }
+                set {
+                    this[this.tablejobReport.holyotColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IstotalNull() {
@@ -3459,6 +3489,18 @@ namespace FPJ0000 {
             public void SetUserProcessNull() {
                 this[this.tablejobReport.UserProcessColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsholyotNull() {
+                return this.IsNull(this.tablejobReport.holyotColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetholyotNull() {
+                this[this.tablejobReport.holyotColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -5065,6 +5107,7 @@ namespace FPJ0000.dsReportTableAdapters {
             tableMapping.ColumnMappings.Add("hrs", "hrs");
             tableMapping.ColumnMappings.Add("ot", "ot");
             tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
+            tableMapping.ColumnMappings.Add("holyot", "holyot");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -5081,9 +5124,9 @@ namespace FPJ0000.dsReportTableAdapters {
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT  yymm, total, uid, uname, hrs, ot, UserProcess\r\nFROM     vUserWorkTimeList" +
-                "\r\nWHERE  (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserPr" +
-                "ocess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
+            this._commandCollection[0].CommandText = "SELECT  yymm, total, uid, uname, hrs, ot, UserProcess, holyot\r\nFROM     vUserWork" +
+                "TimeList\r\nWHERE  (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNUL" +
+                "L(UserProcess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].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, "", "", ""));
diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd
index a96669b..7c83ac3 100644
--- a/SubProject/FPJ0000/dsReport.xsd
+++ b/SubProject/FPJ0000/dsReport.xsd
@@ -12,7 +12,7 @@
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  yymm, total, uid, uname, hrs, ot, UserProcess
+                    <CommandText>SELECT  yymm, total, uid, uname, hrs, ot, UserProcess, holyot
 FROM     vUserWorkTimeList
 WHERE  (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
 ORDER BY yymm</CommandText>
@@ -33,6 +33,7 @@ ORDER BY yymm</CommandText>
               <Mapping SourceColumn="hrs" DataSetColumn="hrs" />
               <Mapping SourceColumn="ot" DataSetColumn="ot" />
               <Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
+              <Mapping SourceColumn="holyot" DataSetColumn="holyot" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -272,10 +273,10 @@ ORDER BY pdate</CommandText>
   <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
+        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
+              <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="22" />
@@ -283,7 +284,7 @@ ORDER BY pdate</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="total" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columntotal" msprop:Generator_ColumnPropNameInRow="total" msprop:Generator_ColumnPropNameInTable="totalColumn" msprop:Generator_UserColumnName="total" type="xs:int" minOccurs="0" />
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -306,10 +307,11 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="holyot" msprop:Generator_ColumnVarNameInTable="columnholyot" msprop:Generator_ColumnPropNameInRow="holyot" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holyotColumn" msprop:Generator_UserColumnName="holyot" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
+        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -345,7 +347,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
+        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -358,7 +360,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
+        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -385,7 +387,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
+        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
@@ -397,7 +399,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
+        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -427,7 +429,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
+        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -534,7 +536,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent">
+        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_RowClassName="K5DailyFormRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" />
@@ -544,7 +546,7 @@ ORDER BY pdate</CommandText>
               <xs:element name="value" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value" type="xs:double" minOccurs="0" />
               <xs:element name="Sign" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Sign" msprop:Generator_ColumnVarNameInTable="columnSign" msprop:Generator_ColumnPropNameInTable="SignColumn" msprop:Generator_UserColumnName="Sign" type="xs:string" minOccurs="0" />
               <xs:element name="Format" msprop:nullValue="N0" msprop:Generator_ColumnPropNameInRow="Format" msprop:Generator_ColumnVarNameInTable="columnFormat" msprop:Generator_ColumnPropNameInTable="FormatColumn" msprop:Generator_UserColumnName="Format" type="xs:string" minOccurs="0" />
-              <xs:element name="graph" msprop:Generator_ColumnVarNameInTable="columngraph" msprop:Generator_ColumnPropNameInRow="graph" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="graphColumn" msprop:Generator_UserColumnName="graph" type="xs:boolean" minOccurs="0" />
+              <xs:element name="graph" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="graph" msprop:Generator_ColumnVarNameInTable="columngraph" msprop:Generator_ColumnPropNameInTable="graphColumn" msprop:Generator_UserColumnName="graph" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss
index ca52c89..68f1ef2 100644
--- a/SubProject/FPJ0000/dsReport.xss
+++ b/SubProject/FPJ0000/dsReport.xss
@@ -6,14 +6,14 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:jobReport" ZOrder="8" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:JobReportDay" ZOrder="7" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
-    <Shape ID="DesignTable:ProcessList" ZOrder="6" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ProcessUserList" ZOrder="5" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
-    <Shape ID="DesignTable:HolidayLIst" ZOrder="3" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PartSummary" ZOrder="4" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:K5DailyForm" ZOrder="1" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:JobReportDay" ZOrder="8" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
+    <Shape ID="DesignTable:ProcessList" ZOrder="7" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ProcessUserList" ZOrder="6" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
+    <Shape ID="DesignTable:HolidayLIst" ZOrder="4" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="3" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PartSummary" ZOrder="5" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:K5DailyForm" ZOrder="2" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file
diff --git a/SubProject/WebServer/Controller/CommonController.cs b/SubProject/WebServer/Controller/CommonController.cs
index aeb8164..e4e46ea 100644
--- a/SubProject/WebServer/Controller/CommonController.cs
+++ b/SubProject/WebServer/Controller/CommonController.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
 using System.Net.Http;
@@ -8,16 +9,42 @@ namespace WebServer
 {
     public class CommonController : BaseController
     {
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+            var db = new EEEntities();
+
+            var sb = new System.Text.StringBuilder();
+            sb.AppendLine("List");
+            sb.AppendLine("Paramter Gcode");
+            sb.AppendLine("Paramter Grp");
+
+            //System.Web.Http.Results.JsonResult<string> 
+            //var json = JsonConvert.SerializeObject(liast);
+            return new HttpResponseMessage()
+            {
+                Content = new StringContent(
+                sb.ToString(),
+                System.Text.Encoding.UTF8,
+                "text/html")
+            };
+
+
+        }
 
         [HttpGet]
         public HttpResponseMessage List()
         {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
             var db = new EEEntities();
-            var liast = db.Common.Where(t => t.gcode == "EET1P").OrderBy(t => t.code).ToArray();
 
+            var vGcode = "EET1P";
+            var vGrp = "99";
+            var liast = db.Common.Where(t => t.gcode == vGcode && t.grp == vGrp).OrderBy(t => t.code).ToArray();
 
             //System.Web.Http.Results.JsonResult<string> 
-            var json = JObject.FromObject(liast);
+            var json = JsonConvert.SerializeObject(liast);
             return new HttpResponseMessage()
             {
                 Content = new StringContent(
diff --git a/SubProject/WebServer/Controller/HomeController.cs b/SubProject/WebServer/Controller/HomeController.cs
index caa7034..37f054a 100644
--- a/SubProject/WebServer/Controller/HomeController.cs
+++ b/SubProject/WebServer/Controller/HomeController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Web.Http;
@@ -8,13 +9,13 @@ namespace WebServer
     public class HomeController : BaseController
     {
         [HttpPost]
-        public void Index([FromBody]string value)
+        public void Index([FromBody] string value)
         {
 
         }
 
         // PUT api/values/5
-        public void Put(int id, [FromBody]string value)
+        public void Put(int id, [FromBody] string value)
         {
         }
 
@@ -64,13 +65,20 @@ namespace WebServer
         {
             //로그인이 되어있지않다면 로그인을 가져온다
             MethodResult result;
-            result = View();
 
             var model = GetGlobalModel();
             var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+            var contents = string.Empty;
 
             //기본값을 찾아서 없애줘야한다
-            var contents = result.Content;
+            Dictionary<string, string> list = new Dictionary<string, string>();
+            list.Add("공용코드 목록", "/Common/List/?Gcode=EET1P&Grp=99");
+            list.Add("사용자 목록", "/User/List/?Gcode=EET1P");
+
+            foreach (var item in list)
+            {
+                contents += $"<a target='_blank' href='{item.Value}'>{item.Key}</a>";
+            }
 
             //공용값 적용
             ApplyCommonValue(ref contents);
@@ -88,6 +96,6 @@ namespace WebServer
 
             return resp;
         }
-      
+
     }
 }
diff --git a/SubProject/WebServer/Controller/UserController.cs b/SubProject/WebServer/Controller/UserController.cs
new file mode 100644
index 0000000..09f249b
--- /dev/null
+++ b/SubProject/WebServer/Controller/UserController.cs
@@ -0,0 +1,58 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace WebServer
+{
+    public class UserController : BaseController
+    {
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+            var db = new EEEntities();
+
+            var sb = new System.Text.StringBuilder();
+            sb.AppendLine("List");
+            sb.AppendLine("Gcode");
+
+            //System.Web.Http.Results.JsonResult<string> 
+            //var json = JsonConvert.SerializeObject(liast);
+            return new HttpResponseMessage()
+            {
+                Content = new StringContent(
+                sb.ToString(),
+                System.Text.Encoding.UTF8,
+                "text/html")
+            };
+        }
+
+        [HttpGet]
+        public HttpResponseMessage List()
+        {
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+            using (var db = new EEEntities())
+            {
+                var vGcode = "EET1P";
+                var liast = db.vGroupUser.AsNoTracking().Where(t => t.gcode == vGcode).OrderBy(t => t.id).ToArray();
+
+                //System.Web.Http.Results.JsonResult<string> 
+                var json = JsonConvert.SerializeObject(liast);
+                return new HttpResponseMessage()
+                {
+                    Content = new StringContent(
+                    json.ToString(),
+                    System.Text.Encoding.UTF8,
+                    "application/json")
+                };
+
+            }
+
+        }
+
+        
+    }
+}
diff --git a/SubProject/WebServer/Program.cs b/SubProject/WebServer/Program.cs
index a2a889b..0113ef4 100644
--- a/SubProject/WebServer/Program.cs
+++ b/SubProject/WebServer/Program.cs
@@ -14,8 +14,10 @@ namespace WebServer
             // Start OWIN host
             try
             {
-                WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
+                var url = "http://127.0.0.1:9000";
+                WebApp.Start<OWIN.Startup>(url: url);
                 Console.WriteLine("start webapp");
+                Console.WriteLine(url);
                 Console.ReadLine();
             }
             catch (Exception ex)
diff --git a/SubProject/WebServer/WebServer.csproj b/SubProject/WebServer/WebServer.csproj
index ecb4f2c..0ddc782 100644
--- a/SubProject/WebServer/WebServer.csproj
+++ b/SubProject/WebServer/WebServer.csproj
@@ -162,6 +162,7 @@
     <Compile Include="Common.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
+    <Compile Include="Controller\UserController.cs" />
     <Compile Include="Controller\CustomerController.cs" />
     <Compile Include="Controller\CommonController.cs" />
     <Compile Include="Controller\APIController.cs" />