..

Project/fMain.Designer.cs

@@ -28,12 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMain));
-            this.tmDisplay = new System.Windows.Forms.Timer(this.components);
+            this.tmDisplay = new System.Windows.Forms.Timer();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.toolTip1 = new System.Windows.Forms.ToolTip();
             this.bw = new System.ComponentModel.BackgroundWorker();
-            this.cmTab = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.cmTab = new System.Windows.Forms.ContextMenuStrip();
             this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.sbBWRun = new System.Windows.Forms.ToolStripStatusLabel();
             this.sbBCD = new System.Windows.Forms.ToolStripStatusLabel();
@@ -150,6 +149,8 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+            this.업무분류및형태설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -496,7 +497,9 @@
             this.mn_dailyhistory.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.목록ToolStripMenuItem1,
             this.자동입력ToolStripMenuItem,
-            this.양식ToolStripMenuItem});
+            this.양식ToolStripMenuItem,
+            this.toolStripMenuItem2,
+            this.업무분류및형태설정ToolStripMenuItem});
             this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image")));
             this.mn_dailyhistory.Name = "mn_dailyhistory";
             this.mn_dailyhistory.Size = new System.Drawing.Size(203, 24);
@@ -506,21 +509,21 @@
             // 목록ToolStripMenuItem1
             // 
             this.목록ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
-            this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
+            this.목록ToolStripMenuItem1.Size = new System.Drawing.Size(214, 24);
             this.목록ToolStripMenuItem1.Text = "목록";
             this.목록ToolStripMenuItem1.Click += new System.EventHandler(this.목록ToolStripMenuItem1_Click);
             // 
             // 자동입력ToolStripMenuItem
             // 
             this.자동입력ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
-            this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
+            this.자동입력ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
             this.자동입력ToolStripMenuItem.Text = "자동입력";
             this.자동입력ToolStripMenuItem.Click += new System.EventHandler(this.자동입력ToolStripMenuItem_Click);
             // 
             // 양식ToolStripMenuItem
             // 
             this.양식ToolStripMenuItem.Name = "양식ToolStripMenuItem";
-            this.양식ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
+            this.양식ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
             this.양식ToolStripMenuItem.Text = "양식";
             this.양식ToolStripMenuItem.Click += new System.EventHandler(this.양식ToolStripMenuItem_Click);
             // 
@@ -568,14 +571,14 @@
             // 관리ToolStripMenuItem
             // 
             this.관리ToolStripMenuItem.Name = "관리ToolStripMenuItem";
-            this.관리ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
+            this.관리ToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
             this.관리ToolStripMenuItem.Text = "재고 관리";
             this.관리ToolStripMenuItem.Click += new System.EventHandler(this.관리ToolStripMenuItem_Click);
             // 
             // 재고현황ToolStripMenuItem
             // 
             this.재고현황ToolStripMenuItem.Name = "재고현황ToolStripMenuItem";
-            this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
+            this.재고현황ToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
             this.재고현황ToolStripMenuItem.Text = "재고 현황";
             this.재고현황ToolStripMenuItem.Click += new System.EventHandler(this.재고현황ToolStripMenuItem_Click);
             // 
@@ -737,39 +740,39 @@
             // 메모장ToolStripMenuItem
             // 
             this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
-            this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.메모장ToolStripMenuItem.Text = "메모장";
             this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(146, 6);
             // 
             // 패치내역ToolStripMenuItem1
             // 
             this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
-            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
+            this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(149, 24);
             this.패치내역ToolStripMenuItem1.Text = "패치 내역";
             this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click);
             // 
             // 메일내역ToolStripMenuItem
             // 
             this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
-            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.메일내역ToolStripMenuItem.Text = "메일 내역";
             this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(146, 6);
             // 
             // minutesToolStripMenuItem
             // 
             this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
             this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
-            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.minutesToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.minutesToolStripMenuItem.Text = "회의록";
             this.minutesToolStripMenuItem.Visible = false;
             this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -778,7 +781,7 @@
             // 
             this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
             this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
-            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.requestITemToolStripMenuItem.Text = "견적요청";
             this.requestITemToolStripMenuItem.Visible = false;
             this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -787,7 +790,7 @@
             // 
             this.freeBoardToolStripMenuItem.Enabled = false;
             this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
-            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.freeBoardToolStripMenuItem.Text = "Free Board";
             this.freeBoardToolStripMenuItem.Visible = false;
             // 
@@ -795,7 +798,7 @@
             // 
             this.bugReportToolStripMenuItem.Enabled = false;
             this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
-            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.bugReportToolStripMenuItem.Text = "Bug Report";
             this.bugReportToolStripMenuItem.Visible = false;
             // 
@@ -803,7 +806,7 @@
             // 
             this.todoListToolStripMenuItem.Enabled = false;
             this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
-            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.todoListToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.todoListToolStripMenuItem.Text = "Todo List";
             this.todoListToolStripMenuItem.Visible = false;
             this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -812,7 +815,7 @@
             // 
             this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
             this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
-            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(149, 24);
             this.메일전송ToolStripMenuItem.Text = "메일전송";
             this.메일전송ToolStripMenuItem.Visible = false;
             this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click);
@@ -1165,6 +1168,18 @@
             this.toolStripButton3.ToolTipText = "휴가신청";
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(211, 6);
+            // 
+            // 업무분류및형태설정ToolStripMenuItem
+            // 
+            this.업무분류및형태설정ToolStripMenuItem.Name = "업무분류및형태설정ToolStripMenuItem";
+            this.업무분류및형태설정ToolStripMenuItem.Size = new System.Drawing.Size(214, 24);
+            this.업무분류및형태설정ToolStripMenuItem.Text = "업무분류 및 형태설정";
+            this.업무분류및형태설정ToolStripMenuItem.Click += new System.EventHandler(this.업무분류및형태설정ToolStripMenuItem_Click);
+            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1315,6 +1330,8 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem16;
         private System.Windows.Forms.ToolStripMenuItem 담당자별업무현황ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 전자실구매승인ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripMenuItem 업무분류및형태설정ToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -1488,5 +1488,11 @@ namespace Project
             if (!ShowForm(formkey))
                 AddForm(formkey, new FEQ0000.fPurchaseConfirm());
         }
+
+        private void 업무분류및형태설정ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var f = new FPJ0000.JobReport_.fJobProcessSelect("",true);
+            f.Show();
+        }
     }
 }

Project/fMain.resx

@@ -457,14 +457,14 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
         h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/UTMj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
+        /U7m/E+5XP8/92TF/3lzYj/U9Of/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP
-        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/3t9r/vV7o9blnWyHc
+        /0Mzc/4/6kz7f3VS5k+QGAyb7A49wbBE5xpUJxQs1RUsvtVdB1PUcaj+//XSiP/7W+3/Xi/0+tyzrRBu
-        gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
+        QPGtrgsg9VCdCFB8s3suTFHlpY5l5wtDDl5Odvt2MUjt/7YKp73FFzs+guQKbva8g2pBBTAXFN3sKQHx
-        v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
+        X7RGiD8u8/x/JUPrz5NsG7XCm736QNs/F93qOQ/WgA6K7/QYF9/oOg7lMjwu9vR8VOrxH4xLvDxAYkBX
-        LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
+        lgItagErwAaK73SLQZkMTyq8smAGPKn0zgSJ1d+v58i9NZEPrIAQeFTh2fek3Os/CD8u9+qFChMPgP7f
-        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+b+gd7fQPo/MoaKnQGr
+        CPdCqccGqDBx4P/+eo4XXVGn3/TE/Qfhl52Rp0BiUGns4N+Bfs2/B3r7/h/oPXP/QO9vIP0fGUPFzoDV
-        2d+jAdUG1LhtIjtQcP6VqfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        7O/RgGoDatw2kR0oOP/ylPp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ
-        BQBvTaqMgm6frAAAAABJRU5ErkJggg==
+        AgBpU6qH8SY7KwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FCOMMON/DataBaseManager.cs

@@ -857,6 +857,7 @@ namespace FCOMMON
             public string code;
             public string title;
             public string svalue;
+            public string svalue2;
             public string grp;
         }
         public static sCodeData getCodeBySvalue(string GroupCode, string svalue)
@@ -865,11 +866,12 @@ namespace FCOMMON
             retval.code = string.Empty;
             retval.title = string.Empty;
             retval.svalue = string.Empty;
+            retval.svalue2 = string.Empty;
             retval.grp = string.Empty;
 
             var cn = getCn();
             cn.Open();
-            var sql = "select isnull(code,''),isnull(memo,'')" +
+            var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')"+
                       " from Common" +
                       " where gcode='" + FCOMMON.info.Login.gcode + "' and  Grp = '{0}' and svalue = '{1}'";
 
@@ -880,13 +882,14 @@ namespace FCOMMON
             {
                 retval.code = da[0].ToString();
                 retval.title = da[1].ToString();
+                retval.svalue = da[2].ToString();
+                retval.svalue2 = da[3].ToString();
             }
 
             cmd.Dispose();
             cn.Close();
             cn.Dispose();
             retval.grp = GroupCode;
-            retval.svalue = svalue;
             return retval;
         }
         public static sCodeData getCodeByMemo(string GroupCode, string memo)
@@ -895,12 +898,13 @@ namespace FCOMMON
             retval.code = string.Empty;
             retval.title = string.Empty;
             retval.svalue = string.Empty;
+            retval.svalue2 = string.Empty;
             retval.grp = string.Empty;
 
 
             var cn = getCn();
             cn.Open();
-            var sql = "select isnull(code,''),isnull(memo,'')" +
+            var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
                       " from Common" +
                       " where gcode='" + FCOMMON.info.Login.gcode + "' and  Grp = '{0}' and memo = '{1}'";
 
@@ -911,13 +915,15 @@ namespace FCOMMON
             {
                 retval.code = da[0].ToString();
                 retval.title = da[1].ToString();
+                retval.svalue = da[2].ToString();
+                retval.svalue2 = da[3].ToString();
             }
 
             cmd.Dispose();
             cn.Close();
             cn.Dispose();
             retval.grp = GroupCode;
-            retval.svalue = memo;
+            //retval.svalue = memo;
             return retval;
         }
 
@@ -953,30 +959,30 @@ namespace FCOMMON
         }
 
 
-        public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "")
+        //public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "",string svalue)
-        {
+        //{
 
-            var cn = getCn();
+        //    var cn = getCn();
-            cn.Open();
+        //    cn.Open();
-            var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" +
+        //    var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" +
-                     " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)";
+        //             " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)";
 
-            sql = string.Format(sql, GroupCode, memo);
+        //    sql = string.Format(sql, GroupCode, memo);
-            var cmd = new SqlCommand(sql, cn);
+        //    var cmd = new SqlCommand(sql, cn);
-            cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
+        //    cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
-            cmd.Parameters.Add(new SqlParameter("grp", GroupCode));
+        //    cmd.Parameters.Add(new SqlParameter("grp", GroupCode));
-            cmd.Parameters.Add(new SqlParameter("code", code));
+        //    cmd.Parameters.Add(new SqlParameter("code", code));
-            cmd.Parameters.Add(new SqlParameter("memo", memo));
+        //    cmd.Parameters.Add(new SqlParameter("memo", memo));
-            cmd.Parameters.Add(new SqlParameter("svalue", svalue));
+        //    cmd.Parameters.Add(new SqlParameter("svalue", svalue));
-            cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
+        //    cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
-            cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
+        //    cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
-            var da = cmd.ExecuteNonQuery();
+        //    var da = cmd.ExecuteNonQuery();
 
-            cmd.Dispose();
+        //    cmd.Dispose();
-            cn.Close();
+        //    cn.Close();
-            cn.Dispose();
+        //    cn.Dispose();
-            return da > 0;
+        //    return da > 0;
-        }
+        //}
 
         public static sCodeData getCodeByCode(string GroupCode, string code)
         {
@@ -984,11 +990,12 @@ namespace FCOMMON
             retval.code = string.Empty;
             retval.title = string.Empty;
             retval.svalue = string.Empty;
+            retval.svalue2 = string.Empty;
             retval.grp = string.Empty;
 
             var cn = getCn();
             cn.Open();
-            var sql = "select isnull(code,''),isnull(memo,'')" +
+            var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
                       " from Common" +
                       " where gcode='" + FCOMMON.info.Login.gcode + "' and  Grp = '{0}' and code = '{1}'";
 
@@ -999,13 +1006,15 @@ namespace FCOMMON
             {
                 retval.code = da[0].ToString();
                 retval.title = da[1].ToString();
+                retval.svalue = da[2].ToString();
+                retval.svalue2 = da[3].ToString();
             }
 
             cmd.Dispose();
             cn.Close();
             cn.Dispose();
             retval.grp = GroupCode;
-            retval.svalue = code;
+            //retval.svalue = code;
             return retval;
         }
 
@@ -1166,10 +1175,11 @@ namespace FCOMMON
             retval.Columns.Add("Value", typeof(string));
             retval.Columns.Add("SValue", typeof(string));
             retval.Columns.Add("FValue", typeof(float));
+            retval.Columns.Add("SValue2", typeof(string));
 
             var cn = getCn();
             cn.Open();
-            var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0)" +
+            var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0),isnull(svalue2,'')" +
                 " from common" +
                 " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" +
                 " and isnull(code,'') <> ''" +
@@ -1189,7 +1199,7 @@ namespace FCOMMON
             var rdr = cmd.ExecuteReader();
             while (rdr.Read())
             {
-                retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString(), rdr[3].ToString() });
+                retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString(), rdr[3].ToString(), rdr[4].ToString() });
             }
             rdr.Close();
             cmd.Dispose();

SubProject/FPJ0000/FPJ0000.csproj

@@ -37,6 +37,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="arCommUtil">
+      <HintPath>..\..\DLL\arCommUtil.dll</HintPath>
+    </Reference>
     <Reference Include="ArSetting.Net4">
       <HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
     </Reference>
@@ -276,6 +279,18 @@
     <Compile Include="JobReport_\fJobChartMenu.Designer.cs">
       <DependentUpon>fJobChartMenu.cs</DependentUpon>
     </Compile>
+    <Compile Include="JobReport_\fJobProcessSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="JobReport_\fJobProcessSelect.Designer.cs">
+      <DependentUpon>fJobProcessSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="JobReport_\fJobProcessManager.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="JobReport_\fJobProcessManager.Designer.cs">
+      <DependentUpon>fJobProcessManager.cs</DependentUpon>
+    </Compile>
     <Compile Include="JobReport_\fProjectConnect.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -669,6 +684,12 @@
     <EmbeddedResource Include="JobReport_\fJobChartMenu.resx">
       <DependentUpon>fJobChartMenu.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="JobReport_\fJobProcessSelect.resx">
+      <DependentUpon>fJobProcessSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="JobReport_\fJobProcessManager.resx">
+      <DependentUpon>fJobProcessManager.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="JobReport_\fProjectConnect.resx">
       <DependentUpon>fProjectConnect.cs</DependentUpon>
     </EmbeddedResource>

SubProject/FPJ0000/JobReport_/fJobProcessManager.Designer.cs

@@ -0,0 +1,639 @@
+namespace FPJ0000.JobReport_
+{
+    partial class fJobProcessManager
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobProcessManager));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.dsJobReport = new FPJ0000.dsJobReport();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.ta = new FPJ0000.dsJobReportTableAdapters.CommonTableAdapter();
+            this.tam = new FPJ0000.dsJobReportTableAdapters.TableAdapterManager();
+            this.bn = new System.Windows.Forms.BindingNavigator(this.components);
+            this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
+            this.btDelete = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
+            this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.btSave = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+            this.클립보드에서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.commonDataGridView = new System.Windows.Forms.DataGridView();
+            this.code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.svalue2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.tbFind = new System.Windows.Forms.TextBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.treeView1 = new System.Windows.Forms.TreeView();
+            this.label8 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.tbItemA = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.tbTypeA = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.tbProcessA = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.btAdd = new System.Windows.Forms.Button();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.tbItemE = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.tbTypeE = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btEdit = new System.Windows.Forms.Button();
+            this.tbProcessE = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
+            this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dsJobReport
+            // 
+            this.dsJobReport.DataSetName = "dsJobReport";
+            this.dsJobReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // bs
+            // 
+            this.bs.DataMember = "Common";
+            this.bs.DataSource = this.dsJobReport;
+            this.bs.Sort = "svalue2,svalue,memo";
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
+            // tam
+            // 
+            this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.CommonTableAdapter = this.ta;
+            this.tam.UpdateOrder = FPJ0000.dsJobReportTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            // 
+            // bn
+            // 
+            this.bn.AddNewItem = null;
+            this.bn.BindingSource = this.bs;
+            this.bn.CountItem = this.bindingNavigatorCountItem;
+            this.bn.DeleteItem = this.btDelete;
+            this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.bindingNavigatorMoveFirstItem,
+            this.bindingNavigatorMovePreviousItem,
+            this.bindingNavigatorSeparator,
+            this.bindingNavigatorPositionItem,
+            this.bindingNavigatorCountItem,
+            this.bindingNavigatorSeparator1,
+            this.bindingNavigatorMoveNextItem,
+            this.bindingNavigatorMoveLastItem,
+            this.bindingNavigatorSeparator2,
+            this.btDelete,
+            this.btSave,
+            this.toolStripButton1});
+            this.bn.Location = new System.Drawing.Point(10, 706);
+            this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
+            this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
+            this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
+            this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
+            this.bn.Name = "bn";
+            this.bn.PositionItem = this.bindingNavigatorPositionItem;
+            this.bn.Size = new System.Drawing.Size(556, 25);
+            this.bn.TabIndex = 0;
+            this.bn.Text = "bindingNavigator1";
+            // 
+            // bindingNavigatorCountItem
+            // 
+            this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
+            this.bindingNavigatorCountItem.Text = "/{0}";
+            this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
+            // 
+            // btDelete
+            // 
+            this.btDelete.Image = ((System.Drawing.Image)(resources.GetObject("btDelete.Image")));
+            this.btDelete.Name = "btDelete";
+            this.btDelete.RightToLeftAutoMirrorImage = true;
+            this.btDelete.Size = new System.Drawing.Size(51, 22);
+            this.btDelete.Text = "삭제";
+            this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
+            // 
+            // bindingNavigatorMoveFirstItem
+            // 
+            this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
+            this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
+            this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
+            // 
+            // bindingNavigatorMovePreviousItem
+            // 
+            this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
+            this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
+            this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
+            // 
+            // bindingNavigatorSeparator
+            // 
+            this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorPositionItem
+            // 
+            this.bindingNavigatorPositionItem.AccessibleName = "위치";
+            this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
+            this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
+            this.bindingNavigatorPositionItem.Text = "0";
+            this.bindingNavigatorPositionItem.ToolTipText = "현재 위치";
+            // 
+            // bindingNavigatorSeparator1
+            // 
+            this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorMoveNextItem
+            // 
+            this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
+            this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
+            this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
+            // 
+            // bindingNavigatorMoveLastItem
+            // 
+            this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
+            this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
+            this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
+            // 
+            // bindingNavigatorSeparator2
+            // 
+            this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
+            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // btSave
+            // 
+            this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
+            this.btSave.Name = "btSave";
+            this.btSave.Size = new System.Drawing.Size(51, 22);
+            this.btSave.Text = "저장";
+            this.btSave.Click += new System.EventHandler(this.commonBindingNavigatorSaveItem_Click);
+            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.클립보드에서ToolStripMenuItem});
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(84, 22);
+            this.toolStripButton1.Text = "가져오기";
+            // 
+            // 클립보드에서ToolStripMenuItem
+            // 
+            this.클립보드에서ToolStripMenuItem.Name = "클립보드에서ToolStripMenuItem";
+            this.클립보드에서ToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.클립보드에서ToolStripMenuItem.Text = "클립보드에서";
+            this.클립보드에서ToolStripMenuItem.Click += new System.EventHandler(this.클립보드에서ToolStripMenuItem_Click);
+            // 
+            // commonDataGridView
+            // 
+            this.commonDataGridView.AutoGenerateColumns = false;
+            this.commonDataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.commonDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.commonDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.code,
+            this.svalueDataGridViewTextBoxColumn,
+            this.svalue2DataGridViewTextBoxColumn});
+            this.commonDataGridView.DataSource = this.bs;
+            this.commonDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.commonDataGridView.Location = new System.Drawing.Point(10, 45);
+            this.commonDataGridView.Name = "commonDataGridView";
+            this.commonDataGridView.RowTemplate.Height = 23;
+            this.commonDataGridView.Size = new System.Drawing.Size(556, 629);
+            this.commonDataGridView.TabIndex = 2;
+            // 
+            // code
+            // 
+            this.code.DataPropertyName = "memo";
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.code.DefaultCellStyle = dataGridViewCellStyle1;
+            this.code.HeaderText = "형태";
+            this.code.Name = "code";
+            // 
+            // svalueDataGridViewTextBoxColumn
+            // 
+            this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue";
+            this.svalueDataGridViewTextBoxColumn.HeaderText = "분류";
+            this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
+            // 
+            // svalue2DataGridViewTextBoxColumn
+            // 
+            this.svalue2DataGridViewTextBoxColumn.DataPropertyName = "svalue2";
+            this.svalue2DataGridViewTextBoxColumn.HeaderText = "프로세스";
+            this.svalue2DataGridViewTextBoxColumn.Name = "svalue2DataGridViewTextBoxColumn";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.commonDataGridView);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.tbFind);
+            this.groupBox1.Controls.Add(this.bn);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(598, 10);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10);
+            this.groupBox1.Size = new System.Drawing.Size(576, 741);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "전체 목록";
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.Gold;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label1.Location = new System.Drawing.Point(10, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(556, 28);
+            this.label1.TabIndex = 4;
+            this.label1.Text = "일반사용자는 [형태] 항목의 데이터를 선택 합니다";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tbFind
+            // 
+            this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tbFind.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbFind.Location = new System.Drawing.Point(10, 674);
+            this.tbFind.Name = "tbFind";
+            this.tbFind.Size = new System.Drawing.Size(556, 32);
+            this.tbFind.TabIndex = 3;
+            this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.treeView1);
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.panel1);
+            this.groupBox2.Controls.Add(this.button1);
+            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox2.Location = new System.Drawing.Point(10, 10);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10);
+            this.groupBox2.Size = new System.Drawing.Size(588, 741);
+            this.groupBox2.TabIndex = 4;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Tree view ( 프로세스 / 분류 / 형태)";
+            this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
+            // 
+            // treeView1
+            // 
+            this.treeView1.AllowDrop = true;
+            this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.treeView1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.treeView1.Location = new System.Drawing.Point(10, 74);
+            this.treeView1.Name = "treeView1";
+            this.treeView1.ShowNodeToolTips = true;
+            this.treeView1.Size = new System.Drawing.Size(568, 493);
+            this.treeView1.TabIndex = 0;
+            this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect);
+            this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown);
+            // 
+            // label8
+            // 
+            this.label8.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label8.Location = new System.Drawing.Point(10, 55);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(568, 19);
+            this.label8.TabIndex = 4;
+            this.label8.Text = "Path://";
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.button2);
+            this.panel1.Controls.Add(this.groupBox4);
+            this.panel1.Controls.Add(this.groupBox3);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(10, 567);
+            this.panel1.Name = "panel1";
+            this.panel1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 5);
+            this.panel1.Size = new System.Drawing.Size(568, 164);
+            this.panel1.TabIndex = 3;
+            // 
+            // button2
+            // 
+            this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.button2.Location = new System.Drawing.Point(261, 10);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(46, 149);
+            this.button2.TabIndex = 3;
+            this.button2.Text = "선택\r\n노드\r\n삭제";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click_1);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.tbItemA);
+            this.groupBox4.Controls.Add(this.label5);
+            this.groupBox4.Controls.Add(this.tbTypeA);
+            this.groupBox4.Controls.Add(this.label6);
+            this.groupBox4.Controls.Add(this.tbProcessA);
+            this.groupBox4.Controls.Add(this.label7);
+            this.groupBox4.Controls.Add(this.btAdd);
+            this.groupBox4.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox4.Location = new System.Drawing.Point(307, 10);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3);
+            this.groupBox4.Size = new System.Drawing.Size(261, 149);
+            this.groupBox4.TabIndex = 2;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "신규 추가";
+            // 
+            // tbItemA
+            // 
+            this.tbItemA.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbItemA.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbItemA.Location = new System.Drawing.Point(74, 80);
+            this.tbItemA.Name = "tbItemA";
+            this.tbItemA.Size = new System.Drawing.Size(170, 22);
+            this.tbItemA.TabIndex = 12;
+            this.tbItemA.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbItemA_KeyDown);
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(40, 86);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(29, 12);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "형태";
+            // 
+            // tbTypeA
+            // 
+            this.tbTypeA.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbTypeA.Location = new System.Drawing.Point(74, 52);
+            this.tbTypeA.Name = "tbTypeA";
+            this.tbTypeA.Size = new System.Drawing.Size(170, 22);
+            this.tbTypeA.TabIndex = 10;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(40, 58);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(29, 12);
+            this.label6.TabIndex = 9;
+            this.label6.Text = "분류";
+            // 
+            // tbProcessA
+            // 
+            this.tbProcessA.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbProcessA.Location = new System.Drawing.Point(74, 24);
+            this.tbProcessA.Name = "tbProcessA";
+            this.tbProcessA.Size = new System.Drawing.Size(170, 22);
+            this.tbProcessA.TabIndex = 8;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(16, 30);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(53, 12);
+            this.label7.TabIndex = 7;
+            this.label7.Text = "프로세스";
+            // 
+            // btAdd
+            // 
+            this.btAdd.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btAdd.Location = new System.Drawing.Point(10, 108);
+            this.btAdd.Name = "btAdd";
+            this.btAdd.Size = new System.Drawing.Size(241, 38);
+            this.btAdd.TabIndex = 2;
+            this.btAdd.Text = "추가";
+            this.btAdd.UseVisualStyleBackColor = true;
+            this.btAdd.Click += new System.EventHandler(this.button3_Click);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.tbItemE);
+            this.groupBox3.Controls.Add(this.label4);
+            this.groupBox3.Controls.Add(this.tbTypeE);
+            this.groupBox3.Controls.Add(this.label3);
+            this.groupBox3.Controls.Add(this.btEdit);
+            this.groupBox3.Controls.Add(this.tbProcessE);
+            this.groupBox3.Controls.Add(this.label2);
+            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Left;
+            this.groupBox3.Location = new System.Drawing.Point(0, 10);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3);
+            this.groupBox3.Size = new System.Drawing.Size(261, 149);
+            this.groupBox3.TabIndex = 2;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "선택자료 편집";
+            // 
+            // tbItemE
+            // 
+            this.tbItemE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbItemE.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbItemE.Location = new System.Drawing.Point(84, 80);
+            this.tbItemE.Name = "tbItemE";
+            this.tbItemE.Size = new System.Drawing.Size(170, 22);
+            this.tbItemE.TabIndex = 6;
+            this.tbItemE.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbItemE_KeyDown);
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(50, 86);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(29, 12);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "형태";
+            // 
+            // tbTypeE
+            // 
+            this.tbTypeE.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbTypeE.Location = new System.Drawing.Point(84, 52);
+            this.tbTypeE.Name = "tbTypeE";
+            this.tbTypeE.Size = new System.Drawing.Size(170, 22);
+            this.tbTypeE.TabIndex = 4;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(50, 58);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(29, 12);
+            this.label3.TabIndex = 3;
+            this.label3.Text = "분류";
+            // 
+            // btEdit
+            // 
+            this.btEdit.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btEdit.Location = new System.Drawing.Point(10, 108);
+            this.btEdit.Name = "btEdit";
+            this.btEdit.Size = new System.Drawing.Size(241, 38);
+            this.btEdit.TabIndex = 2;
+            this.btEdit.Text = "편집";
+            this.btEdit.UseVisualStyleBackColor = true;
+            this.btEdit.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // tbProcessE
+            // 
+            this.tbProcessE.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbProcessE.Location = new System.Drawing.Point(84, 24);
+            this.tbProcessE.Name = "tbProcessE";
+            this.tbProcessE.Size = new System.Drawing.Size(170, 22);
+            this.tbProcessE.TabIndex = 1;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(26, 30);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "프로세스";
+            // 
+            // button1
+            // 
+            this.button1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.button1.Location = new System.Drawing.Point(10, 17);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(568, 38);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "새로고침";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // fJobProcessManager
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1184, 761);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "fJobProcessManager";
+            this.Padding = new System.Windows.Forms.Padding(10);
+            this.Text = "작업형태 선택";
+            this.Load += new System.EventHandler(this.fJobProcessManager_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
+            this.bn.ResumeLayout(false);
+            this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private dsJobReport dsJobReport;
+        private System.Windows.Forms.BindingSource bs;
+        private dsJobReportTableAdapters.CommonTableAdapter ta;
+        private dsJobReportTableAdapters.TableAdapterManager tam;
+        private System.Windows.Forms.BindingNavigator bn;
+        private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
+        private System.Windows.Forms.ToolStripButton btDelete;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
+        private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
+        private System.Windows.Forms.ToolStripButton btSave;
+        private System.Windows.Forms.DataGridView commonDataGridView;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox tbFind;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TreeView treeView1;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalue2DataGridViewTextBoxColumn;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.Button btAdd;
+        private System.Windows.Forms.Button btEdit;
+        private System.Windows.Forms.TextBox tbProcessE;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox tbItemE;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox tbTypeE;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox tbItemA;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox tbTypeA;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox tbProcessA;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.ToolStripDropDownButton toolStripButton1;
+        private System.Windows.Forms.ToolStripMenuItem 클립보드에서ToolStripMenuItem;
+        private System.Windows.Forms.Label label8;
+    }
+}

SubProject/FPJ0000/JobReport_/fJobProcessManager.cs

@@ -0,0 +1,668 @@
+using AR;
+using FarPoint.CalcEngine;
+using FarPoint.Excel;
+using FarPoint.Excel.EntityClassLibrary.DrawingEx;
+using NetOffice.OfficeApi.Enums;
+using NetOffice.OutlookApi;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Entity.Core.Mapping;
+using System.Drawing;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FPJ0000.JobReport_
+{
+    public partial class fJobProcessManager : Form
+    {
+        string GroupCode = "15";
+        public fJobProcessManager()
+        {
+            InitializeComponent();
+            this.dsJobReport.Common.TableNewRow += Common_TableNewRow;
+            this.FormClosing += FJobProcessManager_FormClosing;
+
+            // 이벤트 핸들러 연결
+            treeView1.ItemDrag += TreeView1_ItemDrag;
+            treeView1.DragEnter += TreeView1_DragEnter;
+            treeView1.DragDrop += TreeView1_DragDrop;
+
+        }
+
+        private void TreeView1_ItemDrag(object sender, ItemDragEventArgs e)
+        {
+            // Ctrl 키가 눌린 상태면 복사, 아니면 이동
+            DragDropEffects effect = (ModifierKeys == Keys.Control) ?
+                DragDropEffects.Copy : DragDropEffects.Move;
+            DoDragDrop(e.Item, effect);
+        }
+
+        private void TreeView1_DragEnter(object sender, DragEventArgs e)
+        {
+            // 드래그한 항목이 TreeNode인 경우에만 허용
+            if (e.Data.GetDataPresent(typeof(TreeNode)))
+            {
+                // Ctrl 키가 눌린 상태면 복사 효과 표시
+                e.Effect = (ModifierKeys == Keys.Control) ?
+                    DragDropEffects.Copy : DragDropEffects.Move;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void TreeView1_DragDrop(object sender, DragEventArgs e)
+        {
+            // 드롭된 위치의 노드 찾기
+            Point pt = treeView1.PointToClient(new Point(e.X, e.Y));
+            TreeNode destinationNode = treeView1.GetNodeAt(pt);
+            TreeNode draggedNode = (TreeNode)e.Data.GetData(typeof(TreeNode));
+
+            // 자기 자신이나 자식 노드로는 이동할 수 없음
+            if (destinationNode == null || draggedNode == destinationNode ||
+                IsChildNode(draggedNode, destinationNode))
+            {
+                return;
+            }
+
+            var dr = draggedNode.Tag as dsJobReport.CommonRow;
+
+            if (e.Effect == DragDropEffects.Move)    //이동한다면 기존 데이터는 삭제한다
+            {
+                draggedNode.Remove();
+            }
+
+            var inseritem = e.Effect == DragDropEffects.Copy;
+
+            if (draggedNode.Level == 1)  //분류를 움직이고 있다
+            {
+                if (destinationNode.Level == 2)
+                {
+                    var idx = destinationNode.Parent.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else if (destinationNode.Level == 1)
+                {
+                    var idx = destinationNode.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else
+                {
+                    var idx = destinationNode.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+
+            }
+            else
+            {     // 노드 이동
+
+                if (destinationNode.Level > 1)
+                {
+                    var idx = destinationNode.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else
+                {
+                    var idx = destinationNode.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+            }
+
+        }
+        void UpdateParentInfo(TreeNode cnd, bool newitem)
+        {
+
+        
+
+
+            if (cnd.Level == 2)  //최하위
+            {
+                var grp = cnd.Parent.Text;
+                var prc = cnd.Parent.Parent.Text;
+
+                //신규로추가를 해준다
+                if (newitem)
+                {
+                    dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
+                    ndr.svalue2 = prc;
+                    ndr.svalue = grp;
+                    ndr.memo = cnd.Text;
+                    ndr.wuid = FCOMMON.info.Login.no;
+                    ndr.wdate = DateTime.Now;
+                    ndr.grp = this.GroupCode;
+                    ndr.code = makenewcode();
+                    this.dsJobReport.Common.AddCommonRow(ndr);
+                    cnd.Tag = ndr;
+                }
+                else
+                {
+                    //기존정보를 업데이트한다
+                    var dr = cnd.Tag as dsJobReport.CommonRow;
+                    dr.svalue = grp;
+                    dr.svalue2 = prc;
+                    dr.EndEdit();
+
+                }
+
+            }
+            else if (cnd.Level == 1) //분류(하위항목업데이트필요)
+            {
+                var prc = cnd.Parent.Text;
+                foreach (TreeNode nd in cnd.Nodes)
+                {
+      
+                    //신규로추가를 해준다
+                    if (newitem)
+                    {
+                        dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
+                        ndr.svalue2 = prc;
+                        ndr.svalue = cnd.Text;
+                        ndr.memo = nd.Text;
+                        ndr.wuid = FCOMMON.info.Login.no;
+                        ndr.wdate = DateTime.Now;
+                        ndr.grp = this.GroupCode;
+                        ndr.code = makenewcode();
+                        this.dsJobReport.Common.AddCommonRow(ndr);
+                        nd.Tag = cnd;
+                    }
+                    else
+                    {
+                        var dr = nd.Tag as dsJobReport.CommonRow;
+                        dr.svalue2 = prc;
+                        dr.EndEdit();
+                    }
+                }
+            }
+            else if (cnd.Level == 0) //프로세스(하위항모업데이트필요)
+            {
+
+            }
+
+          
+               
+        }
+
+        private bool IsChildNode(TreeNode parent, TreeNode node)
+        {
+            // 대상 노드가 현재 노드의 자식인지 확인
+            if (node.Parent == null) return false;
+            if (node.Parent == parent) return true;
+            return IsChildNode(parent, node.Parent);
+        }
+
+        private void FJobProcessManager_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (haschanged() == true)
+            {
+                var dlg = UTIL.MsgQ("변경된 내용이 있습니다 그래도 화면을 닫을까요?");
+                if (dlg != DialogResult.Yes)
+                {
+                    e.Cancel = true;
+                    return;
+                }
+            }
+
+        }
+        bool haschanged()
+        {
+            var dt = this.dsJobReport.Common.GetChanges();
+            if (dt == null) return false;
+            if (dt.Rows.Count < 1) return false;
+            return true;
+        }
+
+        private void Common_TableNewRow(object sender, DataTableNewRowEventArgs e)
+        {
+            e.Row["wdate"] = DateTime.Now;
+            e.Row["wuid"] = FCOMMON.info.Login.no;
+            e.Row["gcode"] = FCOMMON.info.Login.gcode;
+            e.Row["grp"] = this.GroupCode;
+        }
+
+        private void commonBindingNavigatorSaveItem_Click(object sender, EventArgs e)
+        {
+            this.Validate();
+            this.bs.EndEdit();
+
+            if (this.haschanged() == false)
+            {
+                UTIL.MsgI("변경된 내용이 없습니다");
+                return;
+            }
+            try
+            {
+                var cnt = this.tam.UpdateAll(this.dsJobReport);
+                AR.UTIL.MsgI($"{cnt}건의 자료가 업데이트 되었습니다");
+                RefreshTreeview();
+            }
+            catch (System.Exception ex)
+            {
+                UTIL.MsgE(ex.Message);
+            }
+        }
+
+        private void RefreshData()
+        {
+            try
+            {
+                this.ta.Fill(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode);
+                this.commonDataGridView.AutoResizeColumns();
+            }
+            catch (System.Exception ex)
+            {
+                AR.UTIL.MsgE(ex.Message);
+            }
+            RefreshTreeview();
+
+        }
+
+        private void fJobProcessManager_Load(object sender, EventArgs e)
+        {
+            RefreshData();
+
+        }
+        void RefreshTreeview()
+        {
+            this.treeView1.Nodes.Clear();
+            //dsJobReport.AcceptChanges();
+            var items = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Detached && t.RowState != DataRowState.Deleted && string.IsNullOrEmpty(t.svalue2));
+            foreach (var item in items)
+            {
+                item.svalue2 = "N/A";
+                item.EndEdit();
+            }
+
+            var grp_process = dsJobReport.Common.OrderBy(t => t.svalue2).GroupBy(t => t.svalue2);
+            foreach (var prc in grp_process)
+            {
+                var prcname = prc.Key;
+                if (prcname.isEmpty()) prcname = "N/A";
+
+                var nd = treeView1.Nodes.Add(prcname, prcname); //add process node
+                var grp_jobtype = prc.OrderBy(t => t.svalue).GroupBy(t => t.svalue);
+                foreach (var grp in grp_jobtype) //job type
+                {
+                    var nd2 = nd.Nodes.Add(grp.Key, grp.Key);
+                    foreach (var item in grp.OrderBy(t => t.memo))
+                    {
+                        var nd3 = nd2.Nodes.Add(item.memo, item.memo);     //job item
+                        if (prcname.Equals("N/A"))
+                            nd3.ForeColor = Color.DimGray;
+                        else
+                            nd3.ForeColor = Color.Black;
+                        nd3.Tag = item;
+                    }
+                }
+            }
+            treeView1.ExpandAll(); //show all 
+
+            groupBox3.Enabled = false;
+
+        }
+
+        private void tbFind_KeyDown(object sender, KeyEventArgs e)
+        {
+            var search = tbFind.Text.Trim();
+            if (e.KeyCode == Keys.Enter)
+            {
+                try
+                {
+                    var cols = new string[] { "svalue2", "svalue", "memo" };
+                    var filterstring = "";
+                    foreach (var col in cols)
+                    {
+                        if (filterstring.Length > 0) filterstring += $" or ";
+                        filterstring += $"{col} like '%{search}%'";
+                    }
+                    if (search.isEmpty())
+                    {
+                        this.bs.Filter = "";
+                        tbFind.BackColor = Color.White;
+                    }
+                    else
+                    {
+                        this.bs.Filter = filterstring;
+                        tbFind.BackColor = Color.Lime;
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    AR.UTIL.MsgE(ex.Message);
+                    tbFind.BackColor = Color.HotPink;
+                }
+                tbFind.Focus();
+                tbFind.SelectAll();
+            }
+
+        }
+
+        private void groupBox2_Enter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            RefreshTreeview();
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            //edit
+            var prc = tbProcessE.Text.Trim();
+            var grp = tbTypeE.Text.Trim();
+            var item = tbItemE.Text.Trim();
+            if (item.isEmpty())
+            {
+                UTIL.MsgE("형태는 반드시 입력되어야 합니다");
+                tbItemE.Focus();
+                return;
+            }
+
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null)
+            {
+                UTIL.MsgE("선택된 노드가 없습니다");
+                return;
+            }
+            if (nd.Tag == null)
+            {
+                UTIL.MsgE("선택노드에 정보가 없습니다\n개발자 문의");
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted && t.svalue2.Equals(prc) && t.svalue.Equals(grp) && t.memo.Equals(item)).Any();
+            if (exist)
+            {
+                UTIL.MsgE("동일한 항목이 존재합니다 / 확인 후 다시 진행 하세요");
+                return;
+            }
+
+
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+
+            var changecate = dr.svalue2.Equals(prc) == false || dr.svalue.Equals(grp) == false;
+
+            dr.svalue2 = prc;
+            dr.svalue = grp;
+            dr.memo = item;
+            dr.EndEdit();
+
+            //카테고리가 변경되었다면 위치를 이동시켜야한다
+            nd.Remove(); //선택노드를 삭제한다.
+            AddNode(prc, grp, item, dr);
+
+
+
+        }
+        void AddNode(string prc, string grp, string item, dsJobReport.CommonRow dr)
+        {
+            //프로세스 노드 선택
+            TreeNode tn_prc = null;
+            if (prc.isEmpty()) prc = "N/A";
+            var prc_nodes = this.treeView1.Nodes.Find(prc, false);
+            if (prc_nodes.Any() == false)
+            {
+                tn_prc = treeView1.Nodes.Add(prc, prc); //신규노드추가
+            }
+            else
+            {
+                tn_prc = prc_nodes.First(); //첫번째 노드로 변경
+            }
+
+            //분류노드확인
+            TreeNode tn_type = null;
+            var type_nodes = tn_prc.Nodes.Find(grp, false);
+            if (type_nodes.Any() == false)
+            {
+                tn_type = tn_prc.Nodes.Add(grp, grp); //신규노드추가
+            }
+            else
+            {
+                tn_type = type_nodes.First(); //첫번째 노드로 변경
+            }
+
+
+            //아이템노드확인
+            TreeNode tn_item = null;
+            var item_nodes = tn_type.Nodes.Find(item, false);
+            if (item_nodes.Any() == false)
+            {
+                tn_item = tn_type.Nodes.Add(item, item); //신규노드추가
+            }
+            else
+            {
+                tn_item = item_nodes.First();
+                //동일한 노드이다
+            }
+
+            tn_item.Tag = dr;
+            treeView1.SelectedNode = tn_item;
+        }
+
+        private void button3_Click(object sender, EventArgs e)
+        {
+            //add
+            var prc = tbProcessA.Text.Trim();
+            var grp = tbTypeA.Text.Trim();
+            var item = tbItemA.Text.Trim();
+            if (item.isEmpty())
+            {
+                UTIL.MsgE("형태는 반드시 입력되어야 합니다");
+                tbItemA.Focus();
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted && t.svalue2.Equals(prc) && t.svalue.Equals(grp) && t.memo.Equals(item)).Any();
+            if (exist)
+            {
+                UTIL.MsgE("동일한 항목이 존재합니다 / 확인 후 다시 진행 하세요");
+                tbItemA.Focus();
+                tbItemA.SelectAll();
+                return;
+            }
+            var dr = this.dsJobReport.Common.NewCommonRow();
+            dr.svalue2 = prc;
+            dr.svalue = grp;
+            dr.memo = item;
+            dr.wuid = FCOMMON.info.Login.no;
+            dr.wdate = DateTime.Now;
+            dr.grp = this.GroupCode;
+            dr.code = makenewcode();
+            this.dsJobReport.Common.AddCommonRow(dr);
+
+            AddNode(prc, grp, item, dr);
+
+            tbItemA.Focus();
+            tbItemA.SelectAll();
+        }
+
+        string makenewcode()
+        {
+            string lastcodename = "";
+            var lastcodedr = dsJobReport.Common.OrderByDescending(t => t.code).FirstOrDefault();
+            if (lastcodedr != null) lastcodename = lastcodedr.code;
+            int newnum = 0;
+            int codenameleng = lastcodename.Length;
+            if (codenameleng == 0) codenameleng = 4;
+
+            if (int.TryParse(lastcodename, out int lastcodenum) == false)
+            {
+                //숫자로되어있지 않다
+                newnum = 1;// newnum.PadLeft(codenameleng, '0');
+            }
+            else
+            {
+                //숫자로되어있으니 +1해서 처리한다.
+                newnum = (lastcodenum + 1);
+
+            }
+            var newnumstr = newnum.ToString().PadLeft(codenameleng, '0');
+
+            return newnumstr;
+        }
+
+        private void tv_AfterSelect(object sender, TreeViewEventArgs e)
+        {
+            label8.Text = "Path://";
+            var tn = this.treeView1.SelectedNode;
+            if (tn == null) return;
+            if (tn.Tag == null) return;
+
+            this.label8.Text = tn.FullPath;
+
+            var dr = tn.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+            tbProcessE.Text = dr.svalue2;
+            tbTypeE.Text = dr.svalue;
+            tbItemE.Text = dr.memo;
+
+            tbProcessA.Text = dr.svalue2;
+            tbTypeA.Text = dr.svalue;
+
+            groupBox3.Enabled = true;
+            groupBox3.Text = $"선택자료 편집({dr.idx})";
+
+        }
+
+        private void tbItemA_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                btAdd.PerformClick();
+        }
+
+        private void tbItemE_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                btEdit.PerformClick();
+        }
+
+        private void 클립보드에서ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            UTIL.MsgI("목록화면고 동일한 배치의 데이터를 클립보드에서 가져옵니다\n(항목/분류/프로세스)");
+            var data = Clipboard.GetText();
+            var lines = data.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            var dlg = UTIL.MsgQ($"{lines.Length} 개의 데이터가 있습니다.\n\n입력 할까요?");
+            if (dlg != DialogResult.Yes) return;
+
+            var icnt = 0;
+            var scnt = 0;
+            var ecnt = 0;
+            foreach (var line in lines)
+            {
+                var buf = line.Split(new char[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                var item = buf[0].Trim();
+                if (item.isEmpty())
+                {
+                    ecnt += 1;
+                    continue;
+                }
+                var grp = buf.Length > 1 ? buf[1].Trim() : string.Empty;
+                var prc = buf.Length > 2 ? buf[2].Trim() : string.Empty;
+
+                //동일항목체크
+                if (this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Detached && t.RowState != DataRowState.Deleted &&
+                t.memo.Equals(item) && t.svalue.Equals(grp) && t.svalue2.Equals(prc)).Any())
+                {
+                    scnt += 1;
+                    continue;
+                }
+
+                icnt += 1;
+
+                var dr = this.dsJobReport.Common.NewCommonRow();
+                dr.svalue2 = prc;
+                dr.svalue = grp;
+                dr.memo = item;
+                dr.wuid = FCOMMON.info.Login.no;
+                dr.wdate = DateTime.Now;
+                dr.grp = this.GroupCode;
+                dr.code = makenewcode();
+                this.dsJobReport.Common.AddCommonRow(dr);
+            }
+
+            var msg = $"가져오기 결과 입니다\n\n추가:{icnt}\n중복:{scnt}\n오류:{ecnt}";
+            AR.UTIL.MsgI(msg);
+            if (icnt > 0)
+                RefreshTreeview();
+
+        }
+
+        private void button2_Click_1(object sender, EventArgs e)
+        {
+            //edit
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null)
+            {
+                UTIL.MsgE("선택된 노드가 없습니다");
+                return;
+            }
+            if (nd.Tag == null)
+            {
+                UTIL.MsgE("선택노드에 정보가 없습니다\n최하위 아이템을 선택하세요\n오류가 반복되면 개발사에 문의 하세요");
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            var prc = dr.svalue2;
+            var grp = dr.svalue;
+            var item = dr.memo;
+
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted && t.svalue2.Equals(prc) && t.svalue.Equals(grp) && t.memo.Equals(item)).FirstOrDefault();
+            if (exist == null)
+            {
+                UTIL.MsgE("해당 데이터를 찾지 못했습니다\n잠시 후 다시 시도하세요");
+                return;
+            }
+            exist.Delete(); //            dsJobReport.Common.RemoveCommonRow(exist);
+            RefreshTreeview();
+        }
+
+        private void btDelete_Click(object sender, EventArgs e)
+        {
+            RefreshTreeview();
+        }
+
+        private void btInsert_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void treeView1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode == Keys.Delete)
+            {
+                var nd = this.treeView1.SelectedNode;
+                if (nd == null) return;
+
+                if(nd.Level == 2)
+                {
+                    var dr = nd.Tag as dsJobReport.CommonRow;
+
+                    nd.Remove();
+                    dr.Delete();
+                }
+                else
+                {
+                    UTIL.MsgE("최하위 항목만 삭제 가능합니다");
+                }
+
+            }
+        }
+    }
+}

SubProject/FPJ0000/JobReport_/fJobProcessManager.resx

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="dsJobReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>317, 17</value>
+  </metadata>
+  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>490, 17</value>
+  </metadata>
+  <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>659, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

SubProject/FPJ0000/JobReport_/fJobProcessSelect.Designer.cs

@@ -0,0 +1,622 @@
+namespace FPJ0000.JobReport_
+{
+    partial class fJobProcessSelect
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobProcessSelect));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.dsJobReport = new FPJ0000.dsJobReport();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.ta = new FPJ0000.dsJobReportTableAdapters.CommonTableAdapter();
+            this.tam = new FPJ0000.dsJobReportTableAdapters.TableAdapterManager();
+            this.bn = new System.Windows.Forms.BindingNavigator(this.components);
+            this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
+            this.btDelete = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
+            this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.btSave = new System.Windows.Forms.ToolStripButton();
+            this.btImport = new System.Windows.Forms.ToolStripDropDownButton();
+            this.클립보드에서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.commonDataGridView = new System.Windows.Forms.DataGridView();
+            this.code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lbWarningUser = new System.Windows.Forms.Label();
+            this.lbWarningManager = new System.Windows.Forms.Label();
+            this.tbFind = new System.Windows.Forms.TextBox();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.treeView1 = new System.Windows.Forms.TreeView();
+            this.btSelect = new System.Windows.Forms.Button();
+            this.label8 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.tbItemA = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.tbTypeA = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.btAdd = new System.Windows.Forms.Button();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.tbItemE = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.tbTypeE = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btEdit = new System.Windows.Forms.Button();
+            this.btRefreshTreeview = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
+            this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dsJobReport
+            // 
+            this.dsJobReport.DataSetName = "dsJobReport";
+            this.dsJobReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // bs
+            // 
+            this.bs.DataMember = "Common";
+            this.bs.DataSource = this.dsJobReport;
+            this.bs.Sort = "svalue2,svalue,memo";
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
+            // tam
+            // 
+            this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.CommonTableAdapter = this.ta;
+            this.tam.UpdateOrder = FPJ0000.dsJobReportTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            // 
+            // bn
+            // 
+            this.bn.AddNewItem = null;
+            this.bn.BindingSource = this.bs;
+            this.bn.CountItem = this.bindingNavigatorCountItem;
+            this.bn.DeleteItem = this.btDelete;
+            this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.bindingNavigatorMoveFirstItem,
+            this.bindingNavigatorMovePreviousItem,
+            this.bindingNavigatorSeparator,
+            this.bindingNavigatorPositionItem,
+            this.bindingNavigatorCountItem,
+            this.bindingNavigatorSeparator1,
+            this.bindingNavigatorMoveNextItem,
+            this.bindingNavigatorMoveLastItem,
+            this.bindingNavigatorSeparator2,
+            this.btDelete,
+            this.btSave,
+            this.btImport});
+            this.bn.Location = new System.Drawing.Point(10, 706);
+            this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
+            this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
+            this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
+            this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
+            this.bn.Name = "bn";
+            this.bn.PositionItem = this.bindingNavigatorPositionItem;
+            this.bn.Size = new System.Drawing.Size(556, 25);
+            this.bn.TabIndex = 0;
+            this.bn.Text = "bindingNavigator1";
+            // 
+            // bindingNavigatorCountItem
+            // 
+            this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
+            this.bindingNavigatorCountItem.Text = "/{0}";
+            this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
+            // 
+            // btDelete
+            // 
+            this.btDelete.Image = ((System.Drawing.Image)(resources.GetObject("btDelete.Image")));
+            this.btDelete.Name = "btDelete";
+            this.btDelete.RightToLeftAutoMirrorImage = true;
+            this.btDelete.Size = new System.Drawing.Size(51, 22);
+            this.btDelete.Text = "삭제";
+            this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
+            // 
+            // bindingNavigatorMoveFirstItem
+            // 
+            this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
+            this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
+            this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
+            // 
+            // bindingNavigatorMovePreviousItem
+            // 
+            this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
+            this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
+            this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
+            // 
+            // bindingNavigatorSeparator
+            // 
+            this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorPositionItem
+            // 
+            this.bindingNavigatorPositionItem.AccessibleName = "위치";
+            this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
+            this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
+            this.bindingNavigatorPositionItem.Text = "0";
+            this.bindingNavigatorPositionItem.ToolTipText = "현재 위치";
+            // 
+            // bindingNavigatorSeparator1
+            // 
+            this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorMoveNextItem
+            // 
+            this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
+            this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
+            this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
+            // 
+            // bindingNavigatorMoveLastItem
+            // 
+            this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
+            this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
+            this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
+            // 
+            // bindingNavigatorSeparator2
+            // 
+            this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
+            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // btSave
+            // 
+            this.btSave.Image = ((System.Drawing.Image)(resources.GetObject("btSave.Image")));
+            this.btSave.Name = "btSave";
+            this.btSave.Size = new System.Drawing.Size(51, 22);
+            this.btSave.Text = "저장";
+            this.btSave.Click += new System.EventHandler(this.commonBindingNavigatorSaveItem_Click);
+            // 
+            // btImport
+            // 
+            this.btImport.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.클립보드에서ToolStripMenuItem});
+            this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image")));
+            this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btImport.Name = "btImport";
+            this.btImport.Size = new System.Drawing.Size(84, 22);
+            this.btImport.Text = "가져오기";
+            // 
+            // 클립보드에서ToolStripMenuItem
+            // 
+            this.클립보드에서ToolStripMenuItem.Name = "클립보드에서ToolStripMenuItem";
+            this.클립보드에서ToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.클립보드에서ToolStripMenuItem.Text = "클립보드에서";
+            this.클립보드에서ToolStripMenuItem.Click += new System.EventHandler(this.클립보드에서ToolStripMenuItem_Click);
+            // 
+            // commonDataGridView
+            // 
+            this.commonDataGridView.AllowUserToAddRows = false;
+            this.commonDataGridView.AllowUserToDeleteRows = false;
+            this.commonDataGridView.AutoGenerateColumns = false;
+            this.commonDataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.commonDataGridView.ColumnHeadersHeight = 40;
+            this.commonDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.commonDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.code,
+            this.svalueDataGridViewTextBoxColumn});
+            this.commonDataGridView.DataSource = this.bs;
+            this.commonDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.commonDataGridView.Location = new System.Drawing.Point(10, 73);
+            this.commonDataGridView.Name = "commonDataGridView";
+            this.commonDataGridView.ReadOnly = true;
+            this.commonDataGridView.RowTemplate.Height = 23;
+            this.commonDataGridView.Size = new System.Drawing.Size(556, 601);
+            this.commonDataGridView.TabIndex = 2;
+            this.commonDataGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.commonDataGridView_CellContentDoubleClick);
+            // 
+            // code
+            // 
+            this.code.DataPropertyName = "memo";
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.code.DefaultCellStyle = dataGridViewCellStyle2;
+            this.code.HeaderText = "형태";
+            this.code.Name = "code";
+            this.code.ReadOnly = true;
+            // 
+            // svalueDataGridViewTextBoxColumn
+            // 
+            this.svalueDataGridViewTextBoxColumn.DataPropertyName = "svalue";
+            this.svalueDataGridViewTextBoxColumn.HeaderText = "분류";
+            this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
+            this.svalueDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.commonDataGridView);
+            this.groupBox1.Controls.Add(this.lbWarningUser);
+            this.groupBox1.Controls.Add(this.lbWarningManager);
+            this.groupBox1.Controls.Add(this.tbFind);
+            this.groupBox1.Controls.Add(this.bn);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(598, 10);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10);
+            this.groupBox1.Size = new System.Drawing.Size(576, 741);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "전체 목록";
+            // 
+            // lbWarningUser
+            // 
+            this.lbWarningUser.BackColor = System.Drawing.Color.Gold;
+            this.lbWarningUser.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbWarningUser.Location = new System.Drawing.Point(10, 45);
+            this.lbWarningUser.Name = "lbWarningUser";
+            this.lbWarningUser.Size = new System.Drawing.Size(556, 28);
+            this.lbWarningUser.TabIndex = 5;
+            this.lbWarningUser.Text = "좌측 트리뷰의 항목을 더블클릭하거나 아래 목록에서 항목을 더블 클릭하면 선택됩니다";
+            this.lbWarningUser.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lbWarningManager
+            // 
+            this.lbWarningManager.BackColor = System.Drawing.Color.Gold;
+            this.lbWarningManager.Dock = System.Windows.Forms.DockStyle.Top;
+            this.lbWarningManager.Location = new System.Drawing.Point(10, 17);
+            this.lbWarningManager.Name = "lbWarningManager";
+            this.lbWarningManager.Size = new System.Drawing.Size(556, 28);
+            this.lbWarningManager.TabIndex = 4;
+            this.lbWarningManager.Text = "일반사용자는 [형태] 항목의 데이터를 선택 합니다";
+            this.lbWarningManager.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tbFind
+            // 
+            this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tbFind.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbFind.Location = new System.Drawing.Point(10, 674);
+            this.tbFind.Name = "tbFind";
+            this.tbFind.Size = new System.Drawing.Size(556, 32);
+            this.tbFind.TabIndex = 3;
+            this.tbFind.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.treeView1);
+            this.groupBox2.Controls.Add(this.btSelect);
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.panel1);
+            this.groupBox2.Controls.Add(this.btRefreshTreeview);
+            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox2.Location = new System.Drawing.Point(10, 10);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10);
+            this.groupBox2.Size = new System.Drawing.Size(588, 741);
+            this.groupBox2.TabIndex = 4;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Tree view ( 프로세스 / 분류 / 형태)";
+            this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
+            // 
+            // treeView1
+            // 
+            this.treeView1.AllowDrop = true;
+            this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.treeView1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.treeView1.Location = new System.Drawing.Point(10, 74);
+            this.treeView1.Name = "treeView1";
+            this.treeView1.ShowNodeToolTips = true;
+            this.treeView1.Size = new System.Drawing.Size(568, 439);
+            this.treeView1.TabIndex = 0;
+            this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect);
+            this.treeView1.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseDoubleClick);
+            this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown);
+            // 
+            // btSelect
+            // 
+            this.btSelect.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btSelect.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.btSelect.Location = new System.Drawing.Point(10, 513);
+            this.btSelect.Name = "btSelect";
+            this.btSelect.Size = new System.Drawing.Size(568, 54);
+            this.btSelect.TabIndex = 5;
+            this.btSelect.Text = "선택 완료";
+            this.btSelect.UseVisualStyleBackColor = true;
+            this.btSelect.Click += new System.EventHandler(this.btSelect_Click);
+            // 
+            // label8
+            // 
+            this.label8.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label8.Location = new System.Drawing.Point(10, 55);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(568, 19);
+            this.label8.TabIndex = 4;
+            this.label8.Text = "Path://";
+            this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.button2);
+            this.panel1.Controls.Add(this.groupBox4);
+            this.panel1.Controls.Add(this.groupBox3);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(10, 567);
+            this.panel1.Name = "panel1";
+            this.panel1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 5);
+            this.panel1.Size = new System.Drawing.Size(568, 164);
+            this.panel1.TabIndex = 3;
+            // 
+            // button2
+            // 
+            this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.button2.Location = new System.Drawing.Point(261, 10);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(46, 149);
+            this.button2.TabIndex = 3;
+            this.button2.Text = "선택\r\n노드\r\n삭제";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click_1);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.tbItemA);
+            this.groupBox4.Controls.Add(this.label5);
+            this.groupBox4.Controls.Add(this.tbTypeA);
+            this.groupBox4.Controls.Add(this.label6);
+            this.groupBox4.Controls.Add(this.btAdd);
+            this.groupBox4.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox4.Location = new System.Drawing.Point(307, 10);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3);
+            this.groupBox4.Size = new System.Drawing.Size(261, 149);
+            this.groupBox4.TabIndex = 2;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "신규 추가";
+            // 
+            // tbItemA
+            // 
+            this.tbItemA.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbItemA.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbItemA.Location = new System.Drawing.Point(74, 80);
+            this.tbItemA.Name = "tbItemA";
+            this.tbItemA.Size = new System.Drawing.Size(170, 22);
+            this.tbItemA.TabIndex = 12;
+            this.tbItemA.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbItemA_KeyDown);
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(40, 86);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(29, 12);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "형태";
+            // 
+            // tbTypeA
+            // 
+            this.tbTypeA.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbTypeA.Location = new System.Drawing.Point(74, 52);
+            this.tbTypeA.Name = "tbTypeA";
+            this.tbTypeA.Size = new System.Drawing.Size(170, 22);
+            this.tbTypeA.TabIndex = 10;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(40, 58);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(29, 12);
+            this.label6.TabIndex = 9;
+            this.label6.Text = "분류";
+            // 
+            // btAdd
+            // 
+            this.btAdd.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btAdd.Location = new System.Drawing.Point(10, 108);
+            this.btAdd.Name = "btAdd";
+            this.btAdd.Size = new System.Drawing.Size(241, 38);
+            this.btAdd.TabIndex = 2;
+            this.btAdd.Text = "추가";
+            this.btAdd.UseVisualStyleBackColor = true;
+            this.btAdd.Click += new System.EventHandler(this.button3_Click);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.tbItemE);
+            this.groupBox3.Controls.Add(this.label4);
+            this.groupBox3.Controls.Add(this.tbTypeE);
+            this.groupBox3.Controls.Add(this.label3);
+            this.groupBox3.Controls.Add(this.btEdit);
+            this.groupBox3.Dock = System.Windows.Forms.DockStyle.Left;
+            this.groupBox3.Location = new System.Drawing.Point(0, 10);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3);
+            this.groupBox3.Size = new System.Drawing.Size(261, 149);
+            this.groupBox3.TabIndex = 2;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "선택자료 편집";
+            // 
+            // tbItemE
+            // 
+            this.tbItemE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbItemE.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbItemE.Location = new System.Drawing.Point(84, 80);
+            this.tbItemE.Name = "tbItemE";
+            this.tbItemE.Size = new System.Drawing.Size(170, 22);
+            this.tbItemE.TabIndex = 6;
+            this.tbItemE.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbItemE_KeyDown);
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(50, 86);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(29, 12);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "형태";
+            // 
+            // tbTypeE
+            // 
+            this.tbTypeE.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbTypeE.Location = new System.Drawing.Point(84, 52);
+            this.tbTypeE.Name = "tbTypeE";
+            this.tbTypeE.Size = new System.Drawing.Size(170, 22);
+            this.tbTypeE.TabIndex = 4;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(50, 58);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(29, 12);
+            this.label3.TabIndex = 3;
+            this.label3.Text = "분류";
+            // 
+            // btEdit
+            // 
+            this.btEdit.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.btEdit.Location = new System.Drawing.Point(10, 108);
+            this.btEdit.Name = "btEdit";
+            this.btEdit.Size = new System.Drawing.Size(241, 38);
+            this.btEdit.TabIndex = 2;
+            this.btEdit.Text = "편집";
+            this.btEdit.UseVisualStyleBackColor = true;
+            this.btEdit.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // btRefreshTreeview
+            // 
+            this.btRefreshTreeview.Dock = System.Windows.Forms.DockStyle.Top;
+            this.btRefreshTreeview.Location = new System.Drawing.Point(10, 17);
+            this.btRefreshTreeview.Name = "btRefreshTreeview";
+            this.btRefreshTreeview.Size = new System.Drawing.Size(568, 38);
+            this.btRefreshTreeview.TabIndex = 1;
+            this.btRefreshTreeview.Text = "새로고침";
+            this.btRefreshTreeview.UseVisualStyleBackColor = true;
+            this.btRefreshTreeview.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // fJobProcessSelect
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1184, 761);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "fJobProcessSelect";
+            this.Padding = new System.Windows.Forms.Padding(10);
+            this.Text = "작업형태 선택";
+            this.Load += new System.EventHandler(this.fJobProcessManager_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
+            this.bn.ResumeLayout(false);
+            this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private dsJobReport dsJobReport;
+        private System.Windows.Forms.BindingSource bs;
+        private dsJobReportTableAdapters.CommonTableAdapter ta;
+        private dsJobReportTableAdapters.TableAdapterManager tam;
+        private System.Windows.Forms.BindingNavigator bn;
+        private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
+        private System.Windows.Forms.ToolStripButton btDelete;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
+        private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
+        private System.Windows.Forms.ToolStripButton btSave;
+        private System.Windows.Forms.DataGridView commonDataGridView;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox tbFind;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TreeView treeView1;
+        private System.Windows.Forms.Button btRefreshTreeview;
+        private System.Windows.Forms.Label lbWarningManager;
+        private System.Windows.Forms.DataGridViewTextBoxColumn code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalue2DataGridViewTextBoxColumn;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.Button btAdd;
+        private System.Windows.Forms.Button btEdit;
+        private System.Windows.Forms.TextBox tbItemE;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox tbTypeE;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox tbItemA;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox tbTypeA;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.ToolStripDropDownButton btImport;
+        private System.Windows.Forms.ToolStripMenuItem 클립보드에서ToolStripMenuItem;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label lbWarningUser;
+        private System.Windows.Forms.Button btSelect;
+    }
+}

SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs

@@ -0,0 +1,768 @@
+using AR;
+using FarPoint.CalcEngine;
+using FarPoint.Excel;
+using FarPoint.Excel.EntityClassLibrary.DrawingEx;
+using NetOffice.OfficeApi.Enums;
+using NetOffice.OutlookApi;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Entity.Core.Mapping;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FPJ0000.JobReport_
+{
+    public partial class fJobProcessSelect : Form
+    {
+        string FullName = string.Empty;
+        string GroupCode = "15";
+        bool IsAdmin = false;
+
+        public fJobProcessSelect(string fullname, bool isAdmin = false)
+        {
+            InitializeComponent();
+            this.IsAdmin = isAdmin;
+            this.FullName = fullname;
+            this.dsJobReport.Common.TableNewRow += Common_TableNewRow;
+            this.FormClosing += FJobProcessManager_FormClosing;
+
+            // 이벤트 핸들러 연결
+            treeView1.ItemDrag += TreeView1_ItemDrag;
+            treeView1.DragEnter += TreeView1_DragEnter;
+            treeView1.DragDrop += TreeView1_DragDrop;
+
+            //var auth = (FCOMMON.info.Login.level >= 5 || isAdmin);
+            btSave.Visible = isAdmin;
+            btDelete.Visible = isAdmin;
+            btImport.Visible = isAdmin;
+            panel1.Visible = isAdmin;
+            btRefreshTreeview.Visible = isAdmin;
+            lbWarningManager.Visible = isAdmin;
+            lbWarningUser.Visible = !isAdmin;
+            btSelect.Visible = !isAdmin;
+            if (fullname.isEmpty() == false)
+                this.Text = $"작업형태 선택(기존값:{fullname})";
+        }
+
+        private void TreeView1_ItemDrag(object sender, ItemDragEventArgs e)
+        {
+            // Ctrl 키가 눌린 상태면 복사, 아니면 이동
+            if (IsAdmin == false) return;
+            DragDropEffects effect = (ModifierKeys == Keys.Control) ?
+                DragDropEffects.Copy : DragDropEffects.Move;
+            DoDragDrop(e.Item, effect);
+        }
+
+        private void TreeView1_DragEnter(object sender, DragEventArgs e)
+        {
+            if (IsAdmin == false) return;
+            // 드래그한 항목이 TreeNode인 경우에만 허용
+            if (e.Data.GetDataPresent(typeof(TreeNode)))
+            {
+                // Ctrl 키가 눌린 상태면 복사 효과 표시
+                e.Effect = (ModifierKeys == Keys.Control) ?
+                    DragDropEffects.Copy : DragDropEffects.Move;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void TreeView1_DragDrop(object sender, DragEventArgs e)
+        {
+            if (IsAdmin == false) return;
+            // 드롭된 위치의 노드 찾기
+            Point pt = treeView1.PointToClient(new Point(e.X, e.Y));
+            TreeNode destinationNode = treeView1.GetNodeAt(pt);
+            TreeNode draggedNode = (TreeNode)e.Data.GetData(typeof(TreeNode));
+
+            // 자기 자신이나 자식 노드로는 이동할 수 없음
+            if (destinationNode == null || draggedNode == destinationNode ||
+                IsChildNode(draggedNode, destinationNode))
+            {
+                return;
+            }
+
+            var dr = draggedNode.Tag as dsJobReport.CommonRow;
+
+            if (e.Effect == DragDropEffects.Move)    //이동한다면 기존 데이터는 삭제한다
+            {
+                draggedNode.Remove();
+            }
+
+            var inseritem = e.Effect == DragDropEffects.Copy;
+
+            if (draggedNode.Level == 1)  //분류를 움직이고 있다
+            {
+                if (destinationNode.Level == 2)
+                {
+                    var idx = destinationNode.Parent.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else if (destinationNode.Level == 1)
+                {
+                    var idx = destinationNode.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else
+                {
+                    var idx = destinationNode.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+
+            }
+            else
+            {     // 노드 이동
+
+                if (destinationNode.Level > 1)
+                {
+                    var idx = destinationNode.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Parent.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+                else
+                {
+                    var idx = destinationNode.Nodes.Add((TreeNode)draggedNode.Clone());
+                    var cnd = destinationNode.Nodes[idx];
+                    UpdateParentInfo(cnd, inseritem);
+                }
+            }
+
+        }
+        void UpdateParentInfo(TreeNode cnd, bool newitem)
+        {
+
+
+
+
+            if (cnd.Level == 1)  //최하위
+            {
+                var grp = cnd.Parent.Text;
+                var prc = cnd.Parent.Parent.Text;
+
+                //신규로추가를 해준다
+                if (newitem)
+                {
+                    dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
+                    //ndr.svalue2 = prc;
+                    ndr.svalue = grp;
+                    ndr.memo = cnd.Text;
+                    ndr.wuid = FCOMMON.info.Login.no;
+                    ndr.wdate = DateTime.Now;
+                    ndr.grp = this.GroupCode;
+                    ndr.code = makenewcode();
+                    this.dsJobReport.Common.AddCommonRow(ndr);
+                    cnd.Tag = ndr;
+                }
+                else
+                {
+                    //기존정보를 업데이트한다
+                    var dr = cnd.Tag as dsJobReport.CommonRow;
+                    dr.svalue = grp;
+                   // dr.svalue2 = prc;
+                    dr.EndEdit();
+
+                }
+
+            }
+            else if (cnd.Level == 1) //분류(하위항목업데이트필요)
+            {
+                var prc = cnd.Parent.Text;
+                foreach (TreeNode nd in cnd.Nodes)
+                {
+
+                    //신규로추가를 해준다
+                    if (newitem)
+                    {
+                        dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
+                    //    ndr.svalue2 = prc;
+                        ndr.svalue = cnd.Text;
+                        ndr.memo = nd.Text;
+                        ndr.wuid = FCOMMON.info.Login.no;
+                        ndr.wdate = DateTime.Now;
+                        ndr.grp = this.GroupCode;
+                        ndr.code = makenewcode();
+                        this.dsJobReport.Common.AddCommonRow(ndr);
+                        nd.Tag = cnd;
+                    }
+                    else
+                    {
+                        var dr = nd.Tag as dsJobReport.CommonRow;
+                     //   dr.svalue2 = prc;
+                        dr.EndEdit();
+                    }
+                }
+            }
+            else if (cnd.Level == 0) //프로세스(하위항모업데이트필요)
+            {
+
+            }
+
+            this.treeView1.SelectedNode = cnd;
+            this.treeView1.SelectedNode.EnsureVisible();
+            this.treeView1.Focus();
+
+        }
+
+        private bool IsChildNode(TreeNode parent, TreeNode node)
+        {
+            // 대상 노드가 현재 노드의 자식인지 확인
+            if (node.Parent == null) return false;
+            if (node.Parent == parent) return true;
+            return IsChildNode(parent, node.Parent);
+        }
+
+        private void FJobProcessManager_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (haschanged() == true)
+            {
+                var dlg = UTIL.MsgQ("변경된 내용이 있습니다 그래도 화면을 닫을까요?");
+                if (dlg != DialogResult.Yes)
+                {
+                    e.Cancel = true;
+                    return;
+                }
+            }
+
+        }
+        bool haschanged()
+        {
+            var dt = this.dsJobReport.Common.GetChanges();
+            if (dt == null) return false;
+            if (dt.Rows.Count < 1) return false;
+            return true;
+        }
+
+        private void Common_TableNewRow(object sender, DataTableNewRowEventArgs e)
+        {
+            e.Row["wdate"] = DateTime.Now;
+            e.Row["wuid"] = FCOMMON.info.Login.no;
+            e.Row["gcode"] = FCOMMON.info.Login.gcode;
+            e.Row["grp"] = this.GroupCode;
+        }
+
+        private void commonBindingNavigatorSaveItem_Click(object sender, EventArgs e)
+        {
+            this.Validate();
+            this.bs.EndEdit();
+
+            if (this.haschanged() == false)
+            {
+                UTIL.MsgI("변경된 내용이 없습니다");
+                return;
+            }
+            try
+            {
+                var cnt = this.tam.UpdateAll(this.dsJobReport);
+                AR.UTIL.MsgI($"{cnt}건의 자료가 업데이트 되었습니다");
+                RefreshTreeview();
+            }
+            catch (System.Exception ex)
+            {
+                UTIL.MsgE(ex.Message);
+            }
+        }
+
+        private void RefreshData()
+        {
+            try
+            {
+                this.ta.Fill(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode);
+                this.commonDataGridView.AutoResizeColumns();
+            }
+            catch (System.Exception ex)
+            {
+                AR.UTIL.MsgE(ex.Message);
+            }
+
+            RefreshTreeview();
+
+        }
+
+        private void fJobProcessManager_Load(object sender, EventArgs e)
+        {
+            RefreshData();
+            this.Show();
+            System.Windows.Forms.Application.DoEvents();
+            this.treeView1.Focus();
+        }
+        void RefreshTreeview()
+        {
+            this.treeView1.Nodes.Clear();
+            //dsJobReport.AcceptChanges();
+            var items = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Detached && t.RowState != DataRowState.Deleted && string.IsNullOrEmpty(t.svalue));
+            foreach (var item in items)
+            {
+                item.svalue = "N/A";
+                item.EndEdit();
+            }
+
+            //선택된 항목이 있따면 해당 항목을 선택해준다.
+            var selectedpath = this.FullName.Split('|');
+            var bAutoselect = selectedpath.Length == 3;
+            var SelPRC = bAutoselect ? selectedpath[0].Trim() : string.Empty;
+            var SelGRP = bAutoselect ? selectedpath[1].Trim() : string.Empty;
+            var SelITM = bAutoselect ? selectedpath[2].Trim() : string.Empty;
+            if (SelPRC.isEmpty()) SelPRC = "N/A";
+
+            var grp_process = dsJobReport.Common.OrderBy(t => t.svalue).GroupBy(t => t.svalue);
+            TreeNode autoSelectNode = null;
+            foreach (var grp in grp_process)
+            {
+                var grpname = grp.Key;
+                if (grpname.isEmpty()) grpname = "N/A";
+                if (grpname.Equals("(N/A)")) grpname = "N/A";
+
+                var nd = treeView1.Nodes.Add(grpname, grpname); //add process node
+                //var grp_jobtype = prc.OrderBy(t => t.svalue).GroupBy(t => t.svalue);
+                //foreach (var grp in grp_jobtype) //job type
+                {
+                    //var nd2 = nd.Nodes.Add(grp.Key, grp.Key);
+                    foreach (var item in grp.OrderBy(t => t.memo))
+                    {
+                        var nd3 = nd.Nodes.Add(item.memo, item.memo);     //job item
+                        if (grpname.Equals("N/A"))
+                            nd3.ForeColor = Color.DimGray;
+                        else
+                            nd3.ForeColor = Color.Black;
+                        nd3.Tag = item;
+
+                        if (bAutoselect)
+                        {
+                            if (grpname.Equals(SelGRP) && item.memo.Equals(SelITM))
+                            {
+                                autoSelectNode = nd3;
+                            }
+                        }
+                    }
+                }
+            }
+            treeView1.ExpandAll(); //show all 
+            groupBox3.Enabled = false;
+            if (autoSelectNode != null)
+            {
+                this.treeView1.SelectedNode = autoSelectNode;
+                this.treeView1.SelectedNode.EnsureVisible();
+                this.treeView1.Focus();
+            }
+
+
+        }
+
+        private void tbFind_KeyDown(object sender, KeyEventArgs e)
+        {
+            var search = tbFind.Text.Trim();
+            if (e.KeyCode == Keys.Enter)
+            {
+                try
+                {
+                    var cols = new string[] { "svalue2", "svalue", "memo" };
+                    var filterstring = "";
+                    foreach (var col in cols)
+                    {
+                        if (filterstring.Length > 0) filterstring += $" or ";
+                        filterstring += $"{col} like '%{search}%'";
+                    }
+                    if (search.isEmpty())
+                    {
+                        this.bs.Filter = "";
+                        tbFind.BackColor = Color.White;
+                    }
+                    else
+                    {
+                        this.bs.Filter = filterstring;
+                        tbFind.BackColor = Color.Lime;
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    AR.UTIL.MsgE(ex.Message);
+                    tbFind.BackColor = Color.HotPink;
+                }
+                tbFind.Focus();
+                tbFind.SelectAll();
+            }
+
+        }
+
+        private void groupBox2_Enter(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            RefreshTreeview();
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            //edit
+            var prc = tbProcessE.Text.Trim();
+            var grp = tbTypeE.Text.Trim();
+            var item = tbItemE.Text.Trim();
+            if (item.isEmpty())
+            {
+                UTIL.MsgE("형태는 반드시 입력되어야 합니다");
+                tbItemE.Focus();
+                return;
+            }
+
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null)
+            {
+                UTIL.MsgE("선택된 노드가 없습니다");
+                return;
+            }
+            if (nd.Tag == null)
+            {
+                UTIL.MsgE("선택노드에 정보가 없습니다\n개발자 문의");
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted &&  t.svalue.Equals(grp) && t.memo.Equals(item)).Any();
+            if (exist)
+            {
+                UTIL.MsgE("동일한 항목이 존재합니다 / 확인 후 다시 진행 하세요");
+                return;
+            }
+
+
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+
+            var changecate = dr.svalue2.Equals(prc) == false || dr.svalue.Equals(grp) == false;
+
+            dr.svalue2 = prc;
+            dr.svalue = grp;
+            dr.memo = item;
+            dr.EndEdit();
+
+            //카테고리가 변경되었다면 위치를 이동시켜야한다
+            nd.Remove(); //선택노드를 삭제한다.
+            AddNode(prc, grp, item, dr);
+
+
+
+        }
+        void AddNode(string prc, string grp, string item, dsJobReport.CommonRow dr)
+        {
+            //프로세스 노드 선택
+            TreeNode tn_prc = null;
+            if (prc.isEmpty()) prc = "N/A";
+            var prc_nodes = this.treeView1.Nodes.Find(prc, false);
+            if (prc_nodes.Any() == false)
+            {
+                tn_prc = treeView1.Nodes.Add(prc, prc); //신규노드추가
+            }
+            else
+            {
+                tn_prc = prc_nodes.First(); //첫번째 노드로 변경
+            }
+
+            //분류노드확인
+            TreeNode tn_type = null;
+            var type_nodes = tn_prc.Nodes.Find(grp, false);
+            if (type_nodes.Any() == false)
+            {
+                tn_type = tn_prc.Nodes.Add(grp, grp); //신규노드추가
+            }
+            else
+            {
+                tn_type = type_nodes.First(); //첫번째 노드로 변경
+            }
+
+
+            //아이템노드확인
+            TreeNode tn_item = null;
+            var item_nodes = tn_type.Nodes.Find(item, false);
+            if (item_nodes.Any() == false)
+            {
+                tn_item = tn_type.Nodes.Add(item, item); //신규노드추가
+            }
+            else
+            {
+                tn_item = item_nodes.First();
+                //동일한 노드이다
+            }
+
+            tn_item.Tag = dr;
+            treeView1.SelectedNode = tn_item;
+        }
+
+        private void button3_Click(object sender, EventArgs e)
+        {
+            //add
+            var prc = tbProcessA.Text.Trim();
+            var grp = tbTypeA.Text.Trim();
+            var item = tbItemA.Text.Trim();
+            if (item.isEmpty())
+            {
+                UTIL.MsgE("형태는 반드시 입력되어야 합니다");
+                tbItemA.Focus();
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted && t.svalue2.Equals(prc) && t.svalue.Equals(grp) && t.memo.Equals(item)).Any();
+            if (exist)
+            {
+                UTIL.MsgE("동일한 항목이 존재합니다 / 확인 후 다시 진행 하세요");
+                tbItemA.Focus();
+                tbItemA.SelectAll();
+                return;
+            }
+            var dr = this.dsJobReport.Common.NewCommonRow();
+            dr.svalue2 = prc;
+            dr.svalue = grp;
+            dr.memo = item;
+            dr.wuid = FCOMMON.info.Login.no;
+            dr.wdate = DateTime.Now;
+            dr.grp = this.GroupCode;
+            dr.code = makenewcode();
+            this.dsJobReport.Common.AddCommonRow(dr);
+
+            AddNode(prc, grp, item, dr);
+
+            tbItemA.Focus();
+            tbItemA.SelectAll();
+        }
+
+        string makenewcode()
+        {
+            string lastcodename = "";
+            var lastcodedr = dsJobReport.Common.OrderByDescending(t => t.code).FirstOrDefault();
+            if (lastcodedr != null) lastcodename = lastcodedr.code;
+            int newnum = 0;
+            int codenameleng = lastcodename.Length;
+            if (codenameleng == 0) codenameleng = 4;
+
+            if (int.TryParse(lastcodename, out int lastcodenum) == false)
+            {
+                //숫자로되어있지 않다
+                newnum = 1;// newnum.PadLeft(codenameleng, '0');
+            }
+            else
+            {
+                //숫자로되어있으니 +1해서 처리한다.
+                newnum = (lastcodenum + 1);
+
+            }
+            var newnumstr = newnum.ToString().PadLeft(codenameleng, '0');
+
+            return newnumstr;
+        }
+
+        private void tv_AfterSelect(object sender, TreeViewEventArgs e)
+        {
+            label8.Text = "Path://";
+            var tn = this.treeView1.SelectedNode;
+            if (tn == null) return;
+            if (tn.Tag == null) return;
+
+            this.label8.Text = tn.FullPath;
+
+            var dr = tn.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+            tbProcessE.Text = dr.svalue2;
+            tbTypeE.Text = dr.svalue;
+            tbItemE.Text = dr.memo;
+
+            tbProcessA.Text = dr.svalue2;
+            tbTypeA.Text = dr.svalue;
+
+            groupBox3.Enabled = true;
+            groupBox3.Text = $"선택자료 편집({dr.idx})";
+
+        }
+
+        private void tbItemA_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                btAdd.PerformClick();
+        }
+
+        private void tbItemE_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+                btEdit.PerformClick();
+        }
+
+        private void 클립보드에서ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            UTIL.MsgI("목록화면고 동일한 배치의 데이터를 클립보드에서 가져옵니다\n(항목/분류/프로세스)");
+            var data = Clipboard.GetText();
+            var lines = data.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            var dlg = UTIL.MsgQ($"{lines.Length} 개의 데이터가 있습니다.\n\n입력 할까요?");
+            if (dlg != DialogResult.Yes) return;
+
+            var icnt = 0;
+            var scnt = 0;
+            var ecnt = 0;
+            foreach (var line in lines)
+            {
+                var buf = line.Split(new char[] { '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                var item = buf[0].Trim();
+                if (item.isEmpty())
+                {
+                    ecnt += 1;
+                    continue;
+                }
+                var grp = buf.Length > 1 ? buf[1].Trim() : string.Empty;
+                var prc = buf.Length > 2 ? buf[2].Trim() : string.Empty;
+
+                //동일항목체크
+                if (this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Detached && t.RowState != DataRowState.Deleted &&
+                t.memo.Equals(item) && t.svalue.Equals(grp) && t.svalue2.Equals(prc)).Any())
+                {
+                    scnt += 1;
+                    continue;
+                }
+
+                icnt += 1;
+
+                var dr = this.dsJobReport.Common.NewCommonRow();
+                dr.svalue2 = prc;
+                dr.svalue = grp;
+                dr.memo = item;
+                dr.wuid = FCOMMON.info.Login.no;
+                dr.wdate = DateTime.Now;
+                dr.grp = this.GroupCode;
+                dr.code = makenewcode();
+                this.dsJobReport.Common.AddCommonRow(dr);
+            }
+
+            var msg = $"가져오기 결과 입니다\n\n추가:{icnt}\n중복:{scnt}\n오류:{ecnt}";
+            AR.UTIL.MsgI(msg);
+            if (icnt > 0)
+                RefreshTreeview();
+
+        }
+
+        private void button2_Click_1(object sender, EventArgs e)
+        {
+            //edit
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null)
+            {
+                UTIL.MsgE("선택된 노드가 없습니다");
+                return;
+            }
+            if (nd.Tag == null)
+            {
+                UTIL.MsgE("선택노드에 정보가 없습니다\n최하위 아이템을 선택하세요\n오류가 반복되면 개발사에 문의 하세요");
+                return;
+            }
+
+            //동일데이터가있는지확인
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            var prc = dr.svalue2;
+            var grp = dr.svalue;
+            var item = dr.memo;
+
+            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted && t.svalue2.Equals(prc) && t.svalue.Equals(grp) && t.memo.Equals(item)).FirstOrDefault();
+            if (exist == null)
+            {
+                UTIL.MsgE("해당 데이터를 찾지 못했습니다\n잠시 후 다시 시도하세요");
+                return;
+            }
+            exist.Delete(); //            dsJobReport.Common.RemoveCommonRow(exist);
+            RefreshTreeview();
+        }
+
+        private void btDelete_Click(object sender, EventArgs e)
+        {
+            RefreshTreeview();
+        }
+
+        private void btInsert_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void treeView1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Delete)
+            {
+                var nd = this.treeView1.SelectedNode;
+                if (nd == null) return;
+
+                if (nd.Level == 2)
+                {
+                    var dr = nd.Tag as dsJobReport.CommonRow;
+
+                    nd.Remove();
+                    dr.Delete();
+                }
+                else
+                {
+                    UTIL.MsgE("최하위 항목만 삭제 가능합니다");
+                }
+
+            }
+        }
+
+        private void treeView1_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
+        {
+            //노드에서 항목 더블클릭
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null) return;
+            if (nd.Level < 2) return;
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+            Feedback(dr);
+        }
+
+        private void btSelect_Click(object sender, EventArgs e)
+        {
+            //트리뷰항목 선택
+            var nd = this.treeView1.SelectedNode;
+            if (nd == null) return;
+            if (nd.Level < 2)
+            {
+                UTIL.MsgE("최하위 항목을 선택하세요");
+                return;
+            }
+            var dr = nd.Tag as dsJobReport.CommonRow;
+            if (dr == null) return;
+            Feedback(dr);
+        }
+
+        private void commonDataGridView_CellContentDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            //데이터그리드뷰 항목 더블클릭
+            var drv = bs.Current as DataRowView;
+            if (drv == null) return;
+            var dr = drv.Row as dsJobReport.CommonRow;
+            if (dr == null) return;
+            Feedback(dr);
+        }
+
+        void Feedback(dsJobReport.CommonRow dr)
+        {
+
+            var prc = dr.svalue2;
+            var grp = dr.svalue;
+            var itm = dr.memo;
+            if (prc.isEmpty()) prc = "N/A";
+            this.SelectedValue = $"{prc}|{grp}|{itm}";
+            DialogResult = DialogResult.OK;
+        }
+
+        public string SelectedValue { get; set; } = "";
+
+
+    }
+}

SubProject/FPJ0000/JobReport_/fJobProcessSelect.resx

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="dsJobReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>317, 17</value>
+  </metadata>
+  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>490, 17</value>
+  </metadata>
+  <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>659, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btDelete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs

@@ -30,26 +30,26 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
-            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -102,7 +102,6 @@
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
             this.lbStt = new System.Windows.Forms.ToolStripLabel();
@@ -125,18 +124,19 @@
             this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -225,7 +225,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -317,7 +316,6 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 25);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -473,7 +471,7 @@
             this.편집ToolStripMenuItem,
             this.삭제ToolStripMenuItem});
             this.cm.Name = "contextMenuStrip1";
-            this.cm.Size = new System.Drawing.Size(224, 332);
+            this.cm.Size = new System.Drawing.Size(224, 310);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -624,174 +622,6 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
-            // fpSpread1_Sheet1
-            // 
-            this.fpSpread1_Sheet1.Reset();
-            this.fpSpread1_Sheet1.SheetName = "Sheet1";
-            // Formulas and custom names must be loaded with R1C1 reference style
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
-            this.fpSpread1_Sheet1.ColumnCount = 20;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
-            this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
-            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당";
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart";
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서";
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F;
-            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package";
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지";
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태";
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태";
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F;
-            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "svalue";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "(공정)업무분류";
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 103F;
-            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "업무분류";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F;
-            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName";
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "프로젝트(아이템)";
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F;
-            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx";
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
-            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx";
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F;
-            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType2.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs";
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "시간";
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
-            numberCellType3.MaximumValue = 999999999999999D;
-            numberCellType3.MinimumValue = -999999999999999D;
-            numberCellType3.NullDisplay = "--";
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot";
-            this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red;
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "초과";
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "비고";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F;
-            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
-            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType1.TimeDefault = new System.DateTime(2024, 2, 6, 22, 53, 4, 0);
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "초과시간범위";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
-            dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
-            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType2.TimeDefault = new System.DateTime(2024, 2, 6, 22, 53, 4, 0);
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "초과종료";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv";
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "기술분류";
-            this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "기술레벨";
-            this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv";
-            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 2;
-            numberCellType4.NegativeRed = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt";
-            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(18).Label = "기술료($K)";
-            this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt";
-            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag";
-            this.fpSpread1_Sheet1.Columns.Get(19).Label = "#";
-            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ShowRowSelector = true;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -842,7 +672,6 @@
             // dtSD
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtSD.Name = "dtSD";
             this.dtSD.Size = new System.Drawing.Size(90, 37);
             this.dtSD.Text = "1982-11-23";
@@ -866,7 +695,6 @@
             // dtED
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtED.Name = "dtED";
             this.dtED.Size = new System.Drawing.Size(90, 37);
             this.dtED.Text = "1982-11-23";
@@ -902,7 +730,6 @@
             // tbProcess
             // 
             this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
-            this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbProcess.Name = "tbProcess";
             this.tbProcess.Size = new System.Drawing.Size(200, 37);
             // 
@@ -951,7 +778,7 @@
             // 태그자료만조회ToolStripMenuItem
             // 
             this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
-            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
             this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
             // 
@@ -1005,6 +832,182 @@
             this.splitContainer1.SplitterWidth = 10;
             this.splitContainer1.TabIndex = 6;
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 20;
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "날짜";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "WW";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "담당";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청부서";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "패키지";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).ColumnSpan = 3;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "(공정)업무분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "업무분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "프로젝트(아이템)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "*";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "시간";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "초과";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).ColumnSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "초과시간범위";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "초과종료";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "기술분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "기술레벨";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "기술료($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "형태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "분류";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "공정";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "시작";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "종료";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
+            this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart";
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F;
+            this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package";
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(5).Tag = "status";
+            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "형태";
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "jobgrp";
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "분류";
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 90F;
+            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "공정";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 80F;
+            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "projectName";
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 158F;
+            this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType5.DecimalPlaces = 0;
+            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType5.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pidx";
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 39F;
+            numberCellType6.MaximumValue = 999999999999999D;
+            numberCellType6.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs";
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
+            numberCellType7.MaximumValue = 999999999999999D;
+            numberCellType7.MinimumValue = -999999999999999D;
+            numberCellType7.NullDisplay = "--";
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ot";
+            this.fpSpread1_Sheet1.Columns.Get(12).ForeColor = System.Drawing.Color.Red;
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "description";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Width = 113F;
+            this.fpSpread1_Sheet1.Columns.Get(14).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+            dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType3.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
+            dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType3.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0);
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = dateTimeCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "otStart";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "시작";
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+            dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType4.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
+            dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType4.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0);
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = dateTimeCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "otEnd";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "종료";
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "kisuldiv";
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Tag = "kisuldiv";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType27;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "kisullv";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Tag = "kisullv";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType8.DecimalPlaces = 2;
+            numberCellType8.NegativeRed = true;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "kisulamt";
+            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Tag = "kisulamt";
+            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType28;
+            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag";
+            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.DataAutoCellTypes = false;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ShowRowSelector = true;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // fJobReport
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1024,13 +1027,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1110,8 +1113,8 @@
 		private System.Windows.Forms.ToolStripButton toolStripButton1;
 		private System.Windows.Forms.ToolStripButton toolStripButton3;
         private System.Windows.Forms.ToolStripMenuItem 개인별프로젝트스케쥴현황ToolStripMenuItem;
-        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
         private System.Windows.Forms.ToolStripButton toolStripButton5;
         private System.Windows.Forms.ToolStripMenuItem qlToolStripMenuItem;
+        private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport.cs

@@ -265,7 +265,7 @@ namespace FPJ0000
             //사용자 목록다중선택으로 인해 처리
             var sql = "SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description," +
                         "remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot," +
-                        "dbo.getWorkWeek(pdate) AS ww, process, tag," +
+                        "dbo.getWorkWeek(pdate) AS ww, process, isnull(jobgrp,'') as jobgrp, tag," +
                         "dbo.getCodeSValue(gcode, '15', type) AS svalue," +
                         "otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otwuid, ottime";
             sql += " FROM JobReport";
@@ -324,13 +324,19 @@ namespace FPJ0000
         {
             //삭제컬럼인덱스
             this.fpSpread1.SuspendLayout();
-            var delindex = this.fpSpread1.ActiveSheet.Columns["pidx"].Index;
+            var prjindex = this.fpSpread1.ActiveSheet.Columns["pidx"].Index;
+            var stsindex = this.fpSpread1.ActiveSheet.Columns["status"].Index;
             for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
             {
-                var state = this.fpSpread1.ActiveSheet.GetValue(i, delindex);
+                var state = this.fpSpread1.ActiveSheet.GetValue(i, prjindex);
                 string stateStr = string.Empty;
                 if (state != null) stateStr = state.ToString();
 
+                var status = this.fpSpread1.ActiveSheet.GetValue(i, stsindex);
+                string statusStr = string.Empty;
+                if (status != null) statusStr = status.ToString();
+
+                //프로젝트여부에따라 회색
                 switch (stateStr.ToLower())
                 {
                     case "-1":
@@ -340,6 +346,14 @@ namespace FPJ0000
                         this.fpSpread1.ActiveSheet.Rows[i].BackColor = SystemColors.Window;
                         break;
                 }
+                if(statusStr.EndsWith("완료"))
+                {
+                    this.fpSpread1.ActiveSheet.Cells[i,stsindex].BackColor = Color.Lime;
+                }
+                else
+                {
+                    this.fpSpread1.ActiveSheet.Cells[i, stsindex].BackColor = Color.Tomato;
+                }
             }
             this.fpSpread1.ResumeLayout();
         }

SubProject/FPJ0000/JobReport_/fJobReport.resx

@@ -130,7 +130,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -141,7 +141,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -150,7 +150,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -159,7 +159,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -170,7 +170,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
         pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
         Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
         /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -193,7 +193,7 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -240,23 +240,52 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1
+        qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO
+        b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY
+        hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
+        9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
+        GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZJZTxNRGIZ7pT/BoBdekhiFCEaNXigIWMAE
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSzKioF6WpTQ3s
-        NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgQKWrZRCK8WIlJal7EvCUoEuM9CZ8npmWgETEr/kybk4
+        Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpzduc0y1npM7lZc674GWpu5yjO2d+e87ZUgOhH3x4Xjzn
-        8z6Z750RcBP4UBl3pVijCCvR/A6Saihy0jyl3Kmlw4r76JBnav15iar8WPj7A3xo7wQ/6VEtW+hVvd7I
+        ++H8vucIuAl8qIy7UqxRhJVofgdJNRQ5aZ5S7tTSYcV9dMgztf68RFV+LPz9AT60d4Kf9KiWLfSqXm9g
-        mm2bMFt3WbVw0DAuWpD3ZRZRJSN2Ybr8oDvqmtBC9bJ+eJTtm3ZAO8NAO8tAM81APbUF5fgmWgw2bDJA
+        zbZNmK27rFo4aPxatCDvyyyiSkbtwnT5QXfUNaGF6mW9fpTtm3ZAO8NAO8tAM81APbUF5cQmWgw2bDJA
-        4wiFvE8zSHyhp/6RBElbqA37FgbmWPyYY8jJoJ+XbKHbtIlvBjsRODGwyEK74ECBfBb+Dzre8eHIUr/J
+        4yiFvE8zSHyhp/6RBElbqA37FgbmWPyYY8jJoJ+XbKHbuIlvBjsRODGwyEK74ECBfBb+Dzre8eHIUj/T
-        W9LwbXHVDSRW3kRlax3y60vhL/WCH0FYcA6BstMoayzjV7HSDJbW7AiM7WZ4QUSx/8eOoSY0jb1GpSaH
+        LWn4trjqBhIrb6KytQ759aXwl3rBjyAsOIdA2WmUNZbxq1hpBktrdgTGdjO8IKLY/2PHcBOaxl+jUpPD
-        l8RWhCDnbQwy6qIgqr6KhOoENA4uoUlvxddfG1gnPQXJemheICwXHvSRZrKa0S68GZKhSJnOS+KqQkn4
+        S2IrQpDzNgYZdVEQVV9FQnUCGgeX0KS34uvQBtZJT0GyHpoXCMuFB32kmaxmrAtvhmUoUqbzkriqUBK+
-        GlJeJkNlsvGrtI9RUJAe1mwOBOX3ugTcBBd201k18dCZ1KjW3sfTtmxEll5CXEU4dNN26EixXMGqCVcn
+        hpSXyVAZbfwq7eMUFKSHNZsDQfm9LgE3wYXddFZNPHRGNaq19/G0LRuRpZcQVxEO3bQdOlIsV7Bq0tWJ
-        ZiIIlO0RXHgkdZzJPYqYciEGJvpQ0JUKmTwLUc8DUKf8jJ/zDHSk2L4pB3oJyxYH/B+7BT4SD7Gv5Agy
+        mQgCZXsEFx5JHWdyjyKmXIiByT4UdKVCJs9C1PMA1Ck/4+c8Ax0ptm/KgV7CssUB/8duwUmJh9hXcgQZ
-        aqNxuyoY0WWXeUmWPAaS+mTyJgHg7gdmWfRzn5hgIUV6Z6pdAl/JoXlfyWHykAd8czxwvSgAaa/ioTIo
+        tdG4XRWM6LLLvCRLHgNJfTJ5kwBw9wOzLPq5T0ywkCK9M9Uuga/k0Lyv5DB5yAO+OR64XhSAtFfxUBkU
-        UKDIReqHeIiqIqAjAi35NzREQDucRKDcXeFiZg+9uE5jcJ7l6R5dwL2aFCSRoLg6Ctm1d3fuOOxbLBE0
+        KFDkIvVDPERVEdARgZb8GxoioB1OIlDurnAxs4deXKcxOM/ydI8t4F5NCpJIUFwdhezauzt3HPYtlgga
-        7Ao425x5V/A/bNwKyXsEZ7M67R3f9dv7PbwfxjGT80Rso9UdJ0WmtE3ObNgtnf0G5+QKhcllCiY3K1YH
+        dgWcbc68K/gfNm6F5D2Cs1md9nbt8PZ+D++HYWzCeSK20eqOkyJT2kwzG3ZL5/cRp2mFgmmZgtHNitXB
-        D9e8lWYxZBx3UhS17nmnedgdFwhOpbSmeYta2k6KFWZvcQO9Q5ILr7+IGmhPUfPa8YTmdq94eaJAIBD8
+        wzVvpVkMGcadFEWte95pHnHHBYJTKa1p3qKWNh+xwuwtbqB3SHLh9RdRA+0pal47ntDc7hUvTxQIBII/
-        Aekrn18k0ej1AAAAAElFTkSuQmCC
+        1jafUMnXM7oAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -323,32 +352,6 @@
         hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
         9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
         GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1
-        qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO
-        b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY
-        hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1
-        9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon
-        GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -400,9 +403,9 @@
     <value>499, 17</value>
   </metadata>
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>561, 17</value>
+    <value>563, 17</value>
   </metadata>
-  <data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="dateTimeCellType3.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
@@ -412,7 +415,7 @@
         AAD/////AQgAAP////8AAQgAAAs=
 </value>
   </data>
-  <data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="dateTimeCellType4.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1

SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs

@@ -55,13 +55,12 @@
             this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
             this.lbOt2 = new System.Windows.Forms.ToolStripStatusLabel();
             this.lbotReason = new System.Windows.Forms.ToolStripStatusLabel();
-            this.cmbType = new System.Windows.Forms.ComboBox();
             this.btSave = new System.Windows.Forms.Button();
             this.dtPdate = new System.Windows.Forms.DateTimePicker();
             this.cmbUser = new System.Windows.Forms.ComboBox();
             this.tbOt = new System.Windows.Forms.TextBox();
             this.tbWW = new System.Windows.Forms.TextBox();
-            this.cmbProcess = new System.Windows.Forms.ComboBox();
+            this.tbJobProcess = new System.Windows.Forms.ComboBox();
             this.cmbState = new System.Windows.Forms.ComboBox();
             this.cmbPackage = new System.Windows.Forms.ComboBox();
             this.cmbRequest = new System.Windows.Forms.ComboBox();
@@ -69,6 +68,9 @@
             this.tbProject = new System.Windows.Forms.ComboBox();
             this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.tbJobType = new System.Windows.Forms.ComboBox();
+            this.tbJobGrp = new System.Windows.Forms.ComboBox();
+            this.cmbTypeFull = new System.Windows.Forms.Button();
             this.chkManagerAlert = new System.Windows.Forms.CheckBox();
             this.tbProjectIndex = new System.Windows.Forms.Button();
             this.grpkisul = new System.Windows.Forms.GroupBox();
@@ -107,7 +109,7 @@
             // hrsLabel
             // 
             hrsLabel.AutoSize = true;
-            hrsLabel.Location = new System.Drawing.Point(19, 124);
+            hrsLabel.Location = new System.Drawing.Point(24, 163);
             hrsLabel.Name = "hrsLabel";
             hrsLabel.Size = new System.Drawing.Size(53, 12);
             hrsLabel.TabIndex = 19;
@@ -116,27 +118,27 @@
             // typeLabel
             // 
             typeLabel.AutoSize = true;
-            typeLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            typeLabel.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            typeLabel.Location = new System.Drawing.Point(374, 35);
+            typeLabel.Location = new System.Drawing.Point(3, 75);
             typeLabel.Name = "typeLabel";
-            typeLabel.Size = new System.Drawing.Size(74, 21);
+            typeLabel.Size = new System.Drawing.Size(69, 20);
             typeLabel.TabIndex = 11;
             typeLabel.Text = "업무형태";
             // 
             // label1
             // 
             label1.AutoSize = true;
-            label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label1.Location = new System.Drawing.Point(-2, 35);
+            label1.Location = new System.Drawing.Point(3, 42);
             label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(74, 21);
+            label1.Size = new System.Drawing.Size(69, 20);
             label1.TabIndex = 7;
             label1.Text = "요청부서";
             // 
             // projectLabel
             // 
             projectLabel.AutoSize = true;
-            projectLabel.Location = new System.Drawing.Point(19, 70);
+            projectLabel.Location = new System.Drawing.Point(19, 108);
             projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             projectLabel.Name = "projectLabel";
             projectLabel.Size = new System.Drawing.Size(53, 12);
@@ -146,57 +148,60 @@
             // label4
             // 
             label4.AutoSize = true;
-            label4.Location = new System.Drawing.Point(578, 10);
+            label4.Font = new System.Drawing.Font("맑은 고딕", 11.25F);
+            label4.Location = new System.Drawing.Point(484, 10);
             label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label4.Name = "label4";
-            label4.Size = new System.Drawing.Size(41, 12);
+            label4.Size = new System.Drawing.Size(54, 20);
             label4.TabIndex = 5;
             label4.Text = "담당자";
             // 
             // stateLabel
             // 
             stateLabel.AutoSize = true;
-            stateLabel.Location = new System.Drawing.Point(320, 10);
+            stateLabel.Font = new System.Drawing.Font("맑은 고딕", 11.25F);
+            stateLabel.Location = new System.Drawing.Point(655, 42);
             stateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             stateLabel.Name = "stateLabel";
-            stateLabel.Size = new System.Drawing.Size(29, 12);
+            stateLabel.Size = new System.Drawing.Size(39, 20);
             stateLabel.TabIndex = 3;
             stateLabel.Text = "상태";
             // 
             // label5
             // 
             label5.AutoSize = true;
-            label5.Location = new System.Drawing.Point(31, 10);
+            label5.Font = new System.Drawing.Font("맑은 고딕", 11.25F);
+            label5.Location = new System.Drawing.Point(18, 10);
             label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             label5.Name = "label5";
-            label5.Size = new System.Drawing.Size(41, 12);
+            label5.Size = new System.Drawing.Size(54, 20);
             label5.TabIndex = 0;
             label5.Text = "등록일";
             // 
             // label3
             // 
             label3.AutoSize = true;
-            label3.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label3.Location = new System.Drawing.Point(186, 35);
+            label3.Location = new System.Drawing.Point(266, 42);
             label3.Name = "label3";
-            label3.Size = new System.Drawing.Size(58, 21);
+            label3.Size = new System.Drawing.Size(54, 20);
             label3.TabIndex = 9;
             label3.Text = "패키지";
             // 
             // label6
             // 
             label6.AutoSize = true;
-            label6.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            label6.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label6.Location = new System.Drawing.Point(683, 35);
+            label6.Location = new System.Drawing.Point(655, 75);
             label6.Name = "label6";
-            label6.Size = new System.Drawing.Size(42, 21);
+            label6.Size = new System.Drawing.Size(39, 20);
             label6.TabIndex = 13;
-            label6.Text = "분류";
+            label6.Text = "공정";
             // 
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new System.Drawing.Point(155, 124);
+            label2.Location = new System.Drawing.Point(160, 163);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(53, 12);
             label2.TabIndex = 21;
@@ -206,7 +211,7 @@
             // 
             label7.AutoSize = true;
             label7.Font = new System.Drawing.Font("맑은 고딕", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label7.Location = new System.Drawing.Point(297, 112);
+            label7.Location = new System.Drawing.Point(302, 151);
             label7.Name = "label7";
             label7.Size = new System.Drawing.Size(73, 13);
             label7.TabIndex = 23;
@@ -253,7 +258,7 @@
             // 
             this.lbSummary.AutoSize = true;
             this.lbSummary.ForeColor = System.Drawing.Color.SlateGray;
-            this.lbSummary.Location = new System.Drawing.Point(70, 159);
+            this.lbSummary.Location = new System.Drawing.Point(75, 198);
             this.lbSummary.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbSummary.Name = "lbSummary";
             this.lbSummary.Size = new System.Drawing.Size(339, 12);
@@ -264,7 +269,7 @@
             // 
             this.tbHrs.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "hrs", true, System.Windows.Forms.DataSourceUpdateMode.OnValidation, null, "N2"));
             this.tbHrs.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbHrs.Location = new System.Drawing.Point(72, 111);
+            this.tbHrs.Location = new System.Drawing.Point(77, 150);
             this.tbHrs.Name = "tbHrs";
             this.tbHrs.Size = new System.Drawing.Size(77, 39);
             this.tbHrs.TabIndex = 20;
@@ -325,24 +330,13 @@
             this.lbotReason.Size = new System.Drawing.Size(121, 17);
             this.lbotReason.Text = "toolStripStatusLabel4";
             // 
-            // cmbType
-            // 
-            this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbType.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.cmbType.FormattingEnabled = true;
-            this.cmbType.Location = new System.Drawing.Point(454, 31);
-            this.cmbType.Name = "cmbType";
-            this.cmbType.Size = new System.Drawing.Size(223, 29);
-            this.cmbType.TabIndex = 12;
-            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
-            // 
             // btSave
             // 
             this.btSave.BackColor = System.Drawing.Color.SkyBlue;
             this.btSave.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.btSave.Location = new System.Drawing.Point(867, 6);
+            this.btSave.Location = new System.Drawing.Point(870, 3);
             this.btSave.Name = "btSave";
-            this.btSave.Size = new System.Drawing.Size(113, 191);
+            this.btSave.Size = new System.Drawing.Size(113, 232);
             this.btSave.TabIndex = 28;
             this.btSave.Text = "확인";
             this.btSave.UseVisualStyleBackColor = false;
@@ -350,10 +344,11 @@
             // 
             // dtPdate
             // 
-            this.dtPdate.Location = new System.Drawing.Point(73, 6);
+            this.dtPdate.Font = new System.Drawing.Font("맑은 고딕", 12F);
+            this.dtPdate.Location = new System.Drawing.Point(78, 6);
             this.dtPdate.Margin = new System.Windows.Forms.Padding(4);
             this.dtPdate.Name = "dtPdate";
-            this.dtPdate.Size = new System.Drawing.Size(178, 21);
+            this.dtPdate.Size = new System.Drawing.Size(242, 29);
             this.dtPdate.TabIndex = 1;
             this.dtPdate.ValueChanged += new System.EventHandler(this.dtPdate_ValueChanged);
             // 
@@ -362,12 +357,13 @@
             this.cmbUser.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.cmbUser.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbUser.Font = new System.Drawing.Font("맑은 고딕", 12F);
             this.cmbUser.FormattingEnabled = true;
             this.cmbUser.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.cmbUser.Location = new System.Drawing.Point(627, 6);
+            this.cmbUser.Location = new System.Drawing.Point(546, 6);
             this.cmbUser.Margin = new System.Windows.Forms.Padding(4);
             this.cmbUser.Name = "cmbUser";
-            this.cmbUser.Size = new System.Drawing.Size(234, 20);
+            this.cmbUser.Size = new System.Drawing.Size(320, 29);
             this.cmbUser.TabIndex = 6;
             this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
             // 
@@ -376,7 +372,7 @@
             this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true));
             this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.tbOt.ForeColor = System.Drawing.Color.Red;
-            this.tbOt.Location = new System.Drawing.Point(213, 111);
+            this.tbOt.Location = new System.Drawing.Point(218, 150);
             this.tbOt.Name = "tbOt";
             this.tbOt.Size = new System.Drawing.Size(77, 39);
             this.tbOt.TabIndex = 22;
@@ -386,32 +382,34 @@
             // 
             // tbWW
             // 
-            this.tbWW.Location = new System.Drawing.Point(253, 6);
+            this.tbWW.Font = new System.Drawing.Font("맑은 고딕", 12F);
+            this.tbWW.Location = new System.Drawing.Point(328, 6);
             this.tbWW.Margin = new System.Windows.Forms.Padding(4);
             this.tbWW.Name = "tbWW";
             this.tbWW.ReadOnly = true;
-            this.tbWW.Size = new System.Drawing.Size(63, 21);
+            this.tbWW.Size = new System.Drawing.Size(148, 29);
             this.tbWW.TabIndex = 2;
             this.tbWW.TabStop = false;
             this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // cmbProcess
+            // tbJobProcess
             // 
-            this.cmbProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbJobProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.cmbProcess.FormattingEnabled = true;
+            this.tbJobProcess.FormattingEnabled = true;
-            this.cmbProcess.Location = new System.Drawing.Point(731, 31);
+            this.tbJobProcess.Location = new System.Drawing.Point(700, 71);
-            this.cmbProcess.Name = "cmbProcess";
+            this.tbJobProcess.Name = "tbJobProcess";
-            this.cmbProcess.Size = new System.Drawing.Size(130, 29);
+            this.tbJobProcess.Size = new System.Drawing.Size(166, 29);
-            this.cmbProcess.TabIndex = 14;
+            this.tbJobProcess.TabIndex = 14;
             // 
             // cmbState
             // 
             this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.cmbState.Font = new System.Drawing.Font("맑은 고딕", 12F);
             this.cmbState.FormattingEnabled = true;
-            this.cmbState.Location = new System.Drawing.Point(353, 6);
+            this.cmbState.Location = new System.Drawing.Point(700, 38);
             this.cmbState.Margin = new System.Windows.Forms.Padding(4);
             this.cmbState.Name = "cmbState";
-            this.cmbState.Size = new System.Drawing.Size(217, 20);
+            this.cmbState.Size = new System.Drawing.Size(166, 29);
             this.cmbState.TabIndex = 4;
             this.cmbState.SelectedIndexChanged += new System.EventHandler(this.chkform_indexchan);
             // 
@@ -420,9 +418,9 @@
             this.cmbPackage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPackage.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.cmbPackage.FormattingEnabled = true;
-            this.cmbPackage.Location = new System.Drawing.Point(239, 31);
+            this.cmbPackage.Location = new System.Drawing.Point(328, 38);
             this.cmbPackage.Name = "cmbPackage";
-            this.cmbPackage.Size = new System.Drawing.Size(131, 29);
+            this.cmbPackage.Size = new System.Drawing.Size(318, 29);
             this.cmbPackage.TabIndex = 10;
             // 
             // cmbRequest
@@ -430,15 +428,16 @@
             this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbRequest.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.cmbRequest.FormattingEnabled = true;
-            this.cmbRequest.Location = new System.Drawing.Point(72, 31);
+            this.cmbRequest.Location = new System.Drawing.Point(77, 38);
             this.cmbRequest.Name = "cmbRequest";
-            this.cmbRequest.Size = new System.Drawing.Size(108, 29);
+            this.cmbRequest.Size = new System.Drawing.Size(183, 29);
             this.cmbRequest.TabIndex = 8;
+            this.cmbRequest.SelectedIndexChanged += new System.EventHandler(this.cmbRequest_SelectedIndexChanged);
             // 
             // chkAutoAdd
             // 
             this.chkAutoAdd.AutoSize = true;
-            this.chkAutoAdd.Location = new System.Drawing.Point(73, 181);
+            this.chkAutoAdd.Location = new System.Drawing.Point(78, 220);
             this.chkAutoAdd.Name = "chkAutoAdd";
             this.chkAutoAdd.Size = new System.Drawing.Size(176, 16);
             this.chkAutoAdd.TabIndex = 26;
@@ -452,7 +451,7 @@
             this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbProject.Font = new System.Drawing.Font("굴림", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.tbProject.FormattingEnabled = true;
-            this.tbProject.Location = new System.Drawing.Point(73, 65);
+            this.tbProject.Location = new System.Drawing.Point(78, 103);
             this.tbProject.Name = "tbProject";
             this.tbProject.Size = new System.Drawing.Size(714, 23);
             this.tbProject.TabIndex = 16;
@@ -468,18 +467,21 @@
             this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
             this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBoxEx1.FilePath = "";
-            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 205);
+            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 243);
             this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = resources.GetString("richTextBoxEx1.Rtf");
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;
-            this.richTextBoxEx1.Size = new System.Drawing.Size(988, 449);
+            this.richTextBoxEx1.Size = new System.Drawing.Size(988, 411);
             this.richTextBoxEx1.TabIndex = 58;
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
+            this.panel1.Controls.Add(this.tbJobType);
+            this.panel1.Controls.Add(this.tbJobGrp);
+            this.panel1.Controls.Add(this.cmbTypeFull);
             this.panel1.Controls.Add(this.chkManagerAlert);
             this.panel1.Controls.Add(this.tbProjectIndex);
             this.panel1.Controls.Add(this.grpkisul);
@@ -496,7 +498,6 @@
             this.panel1.Controls.Add(this.lbTitleTip);
             this.panel1.Controls.Add(hrsLabel);
             this.panel1.Controls.Add(this.chkAutoAdd);
-            this.panel1.Controls.Add(this.cmbType);
             this.panel1.Controls.Add(label5);
             this.panel1.Controls.Add(typeLabel);
             this.panel1.Controls.Add(this.lbSummary);
@@ -507,20 +508,54 @@
             this.panel1.Controls.Add(label3);
             this.panel1.Controls.Add(stateLabel);
             this.panel1.Controls.Add(this.cmbUser);
-            this.panel1.Controls.Add(this.cmbProcess);
+            this.panel1.Controls.Add(this.tbJobProcess);
             this.panel1.Controls.Add(this.tbWW);
             this.panel1.Controls.Add(label4);
             this.panel1.Controls.Add(this.tbOt);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(988, 205);
+            this.panel1.Size = new System.Drawing.Size(988, 243);
             this.panel1.TabIndex = 0;
             // 
+            // tbJobType
+            // 
+            this.tbJobType.BackColor = System.Drawing.Color.Violet;
+            this.tbJobType.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbJobType.ForeColor = System.Drawing.Color.Black;
+            this.tbJobType.FormattingEnabled = true;
+            this.tbJobType.Location = new System.Drawing.Point(404, 198);
+            this.tbJobType.Name = "tbJobType";
+            this.tbJobType.Size = new System.Drawing.Size(122, 29);
+            this.tbJobType.TabIndex = 33;
+            this.tbJobType.Visible = false;
+            // 
+            // tbJobGrp
+            // 
+            this.tbJobGrp.BackColor = System.Drawing.Color.Violet;
+            this.tbJobGrp.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbJobGrp.ForeColor = System.Drawing.Color.Black;
+            this.tbJobGrp.FormattingEnabled = true;
+            this.tbJobGrp.Location = new System.Drawing.Point(532, 198);
+            this.tbJobGrp.Name = "tbJobGrp";
+            this.tbJobGrp.Size = new System.Drawing.Size(122, 29);
+            this.tbJobGrp.TabIndex = 32;
+            this.tbJobGrp.Visible = false;
+            // 
+            // cmbTypeFull
+            // 
+            this.cmbTypeFull.Font = new System.Drawing.Font("맑은 고딕", 11.25F);
+            this.cmbTypeFull.Location = new System.Drawing.Point(77, 71);
+            this.cmbTypeFull.Name = "cmbTypeFull";
+            this.cmbTypeFull.Size = new System.Drawing.Size(569, 29);
+            this.cmbTypeFull.TabIndex = 31;
+            this.cmbTypeFull.UseVisualStyleBackColor = true;
+            this.cmbTypeFull.Click += new System.EventHandler(this.cmbType_Click);
+            // 
             // chkManagerAlert
             // 
             this.chkManagerAlert.AutoSize = true;
-            this.chkManagerAlert.Location = new System.Drawing.Point(265, 181);
+            this.chkManagerAlert.Location = new System.Drawing.Point(270, 220);
             this.chkManagerAlert.Name = "chkManagerAlert";
             this.chkManagerAlert.Size = new System.Drawing.Size(116, 16);
             this.chkManagerAlert.TabIndex = 30;
@@ -530,7 +565,7 @@
             // 
             // tbProjectIndex
             // 
-            this.tbProjectIndex.Location = new System.Drawing.Point(793, 65);
+            this.tbProjectIndex.Location = new System.Drawing.Point(798, 103);
             this.tbProjectIndex.Name = "tbProjectIndex";
             this.tbProjectIndex.Size = new System.Drawing.Size(68, 23);
             this.tbProjectIndex.TabIndex = 25;
@@ -547,7 +582,7 @@
             this.grpkisul.Controls.Add(label9);
             this.grpkisul.Controls.Add(this.cmb_kisullv);
             this.grpkisul.Controls.Add(label8);
-            this.grpkisul.Location = new System.Drawing.Point(661, 92);
+            this.grpkisul.Location = new System.Drawing.Point(666, 131);
             this.grpkisul.Name = "grpkisul";
             this.grpkisul.Size = new System.Drawing.Size(200, 105);
             this.grpkisul.TabIndex = 29;
@@ -589,7 +624,7 @@
             // 
             this.dateTimePicker2.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker2.Location = new System.Drawing.Point(455, 126);
+            this.dateTimePicker2.Location = new System.Drawing.Point(460, 165);
             this.dateTimePicker2.Margin = new System.Windows.Forms.Padding(4);
             this.dateTimePicker2.Name = "dateTimePicker2";
             this.dateTimePicker2.Size = new System.Drawing.Size(153, 21);
@@ -599,7 +634,7 @@
             // 
             this.dateTimePicker1.CustomFormat = "yyyy-MM-dd hh:mm:ss";
             this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dateTimePicker1.Location = new System.Drawing.Point(297, 126);
+            this.dateTimePicker1.Location = new System.Drawing.Point(302, 165);
             this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4);
             this.dateTimePicker1.Name = "dateTimePicker1";
             this.dateTimePicker1.Size = new System.Drawing.Size(153, 21);
@@ -609,7 +644,7 @@
             // 
             this.lbTitleTip.AutoSize = true;
             this.lbTitleTip.ForeColor = System.Drawing.Color.SlateGray;
-            this.lbTitleTip.Location = new System.Drawing.Point(72, 94);
+            this.lbTitleTip.Location = new System.Drawing.Point(77, 133);
             this.lbTitleTip.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbTitleTip.Name = "lbTitleTip";
             this.lbTitleTip.Size = new System.Drawing.Size(339, 12);
@@ -662,7 +697,6 @@
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.statusStrip1);
             this.Name = "fJobReport_Add";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "업무일지 등록/변경";
             this.Load += new System.EventHandler(this.fJobReport_Add_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
@@ -688,13 +722,12 @@
         private System.Windows.Forms.StatusStrip statusStrip1;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
         private System.Windows.Forms.ToolStripStatusLabel lbIndex;
-        private System.Windows.Forms.ComboBox cmbType;
         private System.Windows.Forms.Button btSave;
         private System.Windows.Forms.DateTimePicker dtPdate;
         private System.Windows.Forms.ComboBox cmbUser;
         private System.Windows.Forms.TextBox tbOt;
         private System.Windows.Forms.TextBox tbWW;
-        private System.Windows.Forms.ComboBox cmbProcess;
+        private System.Windows.Forms.ComboBox tbJobProcess;
         private System.Windows.Forms.ComboBox cmbState;
         private System.Windows.Forms.ComboBox cmbPackage;
         private System.Windows.Forms.ComboBox cmbRequest;
@@ -717,5 +750,8 @@
         private System.Windows.Forms.Button tbProjectIndex;
         private System.Windows.Forms.CheckBox chkManagerAlert;
         private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.Button cmbTypeFull;
+        private System.Windows.Forms.ComboBox tbJobGrp;
+        private System.Windows.Forms.ComboBox tbJobType;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -1,4 +1,5 @@
-using FCOMMON;
+using AR;
+using FCOMMON;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -39,6 +40,10 @@ namespace FPJ0000.JobReport_
             copyMOde = copy;
             this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged;
             this.grpkisul.Visible = getKisulInput;
+
+            var bDev = System.Diagnostics.Debugger.IsAttached || FCOMMON.info.Login.level >= 9;
+            tbJobType.Visible = bDev;
+            tbJobGrp.Visible = bDev;
         }
 
         void tbProject_SelectedIndexChanged(object sender, EventArgs e)
@@ -106,16 +111,24 @@ namespace FPJ0000.JobReport_
             this.cmbPackage.DataSource = dt_package;
 
             //업무형태
-            var dt_type = FCOMMON.DBM.getCodeTable("15", "code,memo,svalue");
+            //var dt_type = FCOMMON.DBM.getCodeTable("15", "code,memo,svalue");
-            this.cmbType.DisplayMember = "Value";
+            //this.cmbType.DisplayMember = "Value";
-            this.cmbType.ValueMember = "Value";
+            //this.cmbType.ValueMember = "Value";
-            this.cmbType.DataSource = dt_type;
+            //this.cmbType.DataSource = dt_type;
+
+            //공정
+            var dt_jobprocess = FCOMMON.DBM.getCodeTable("25", "code,memo,svalue");
+            tbJobProcess.Items.Clear();
+            foreach (DataRow item in dt_jobprocess.Rows)
+            {
+                tbJobProcess.Items.Add(item["Value"].ToString());
+            }
 
             //업무분류
             var dt_process = FCOMMON.DBM.getCodeTable("16", "code,memo,svalue");
-            this.cmbProcess.DisplayMember = "Value";
+            this.tbJobProcess.DisplayMember = "Value";
-            this.cmbProcess.ValueMember = "Value";
+            this.tbJobProcess.ValueMember = "Value";
-            this.cmbProcess.DataSource = dt_process;
+            this.tbJobProcess.DataSource = dt_process;
 
             if (getKisulInput)
             {
@@ -155,18 +168,39 @@ namespace FPJ0000.JobReport_
             tbProject.Text = dr.projectName;
             cmbRequest.SelectedValue = dr.requestpart;
             cmbPackage.SelectedValue = dr.package;
-            cmbType.SelectedValue = dr.type;
+
-            cmbProcess.SelectedValue = dr.process;
+            tbJobProcess.SelectedValue = dr.process;
+            tbJobProcess.Text = dr.process;
+            if (dr.IsjobgrpNull() || dr.jobgrp.isEmpty())
+            {
+                //공용코드에서 가져온다
+                var cdr = FCOMMON.DBM.getCodeByMemo("15", dr.type);
+                if (cdr.svalue.isEmpty() == false)
+                    tbJobGrp.Text = cdr.svalue;
+                else
+                    tbJobGrp.Text = string.Empty;
+
+                //this.cmbType.DisplayMember = "Value";
+                //this.cmbType.ValueMember = "Value";
+                //this.cmbType.DataSource = dt_type;
+
+            }
+            else tbJobGrp.Text = dr.jobgrp;
+
+            tbJobType.Text = dr.type;
+
             tbTag.Text = dr.tag;
 
-            if (dr.process.isEmpty() && cmbProcess.SelectedIndex < 0)	//기본값을 찾는다
+            RefreshJobTypeFull();
+
+            if (dr.process.isEmpty() && tbJobProcess.SelectedIndex < 0)	//기본값을 찾는다
             {
                 var dts = dt_process.AsEnumerable().Where(t => t.IsNull("SValue") == false).ToList();
                 foreach (var dr in dts)
                 {
                     if (dr["Svalue"].ToString().Equals("O"))
                     {
-                        cmbProcess.Text = dr["Value"].ToString();
+                        tbJobProcess.Text = dr["Value"].ToString();
                         break;
                     }
                 }
@@ -255,10 +289,10 @@ namespace FPJ0000.JobReport_
             }
 
             //231026
-            if(cmbProcess.Text.isEmpty())
+            if (tbJobProcess.Text.isEmpty())
             {
-                if (cmbProcess.Items.Count == 1)
+                if (tbJobProcess.Items.Count == 1)
-                    cmbProcess.SelectedIndex = 0;
+                    tbJobProcess.SelectedIndex = 0;
             }
 
             this.Show();
@@ -349,6 +383,23 @@ namespace FPJ0000.JobReport_
 
             bInit = true;
         }
+
+        void RefreshJobTypeFull()
+        {
+            var jprc = tbJobProcess.Text.Trim();
+            if (jprc.isEmpty()) jprc = "N/A";
+            if (jprc.Equals("(N/A)")) jprc = "N/A";
+
+            var jgrp = tbJobGrp.Text.Trim();
+            var jtype = tbJobType.Text.Trim();
+
+            var fullname = $"{jtype} ← {jgrp} ← {jprc}";
+
+            if (jtype.isEmpty()) cmbTypeFull.Text = "업무형태를 선택하세요";
+            else cmbTypeFull.Text = fullname;
+
+            cmbTypeFull.BackColor = jtype.isEmpty() ? Color.HotPink : Color.White;
+        }
         //    editform.editor ed;
         void ctl_KeyDown(object sender, KeyEventArgs e)
         {
@@ -407,10 +458,15 @@ namespace FPJ0000.JobReport_
                                             this.cmbPackage.Text = predr["package"].ToString(); //190506
 
                                         if (predr["type"] != DBNull.Value)
-                                            this.cmbType.Text = predr["type"].ToString(); //190506
+                                            this.tbJobType.Text = predr["type"].ToString(); //190506
+
+                                        if (predr["jobgrp"] != DBNull.Value)
+                                            this.tbJobGrp.Text = predr["jobgrp"].ToString(); //190506
 
                                         if (predr["process"] != DBNull.Value)
-                                            cmbProcess.Text = predr["process"].ToString(); //190506
+                                            tbJobProcess.Text = predr["process"].ToString(); //190506
+
+                                        RefreshJobTypeFull(); //update fullname
                                     }
                                 }
                             }
@@ -461,8 +517,7 @@ namespace FPJ0000.JobReport_
                 return;
             }
 
-
+            if (tbJobType.Text.ToString() != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
-            if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
             {
                 FCOMMON.Util.MsgE("진행 내용이 없습니다.");
                 this.richTextBoxEx1.Focus();
@@ -492,16 +547,16 @@ namespace FPJ0000.JobReport_
                 }
             }
 
-            if (cmbType.Text.Trim() == "")
+            if (tbJobType.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("업무형태를 선택하세요");
-                cmbType.Focus();
+                cmbTypeFull.Focus();
                 return;
             }
-            if (cmbProcess.Text.Trim() == "")
+            if (tbJobProcess.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("업무분류를 선택하세요");
-                cmbProcess.Focus();
+                tbJobProcess.Focus();
                 return;
             }
             if (cmbUser.SelectedIndex < 0)
@@ -621,8 +676,9 @@ namespace FPJ0000.JobReport_
             else dr.SetpidxNull();
             this.dr.requestpart = cmbRequest.Text;
             this.dr.package = cmbPackage.Text;
-            this.dr.type = cmbType.Text;
+            this.dr.type = tbJobType.Text.Trim();
-            this.dr.process = cmbProcess.Text;
+            this.dr.process = tbJobProcess.Text.Trim();
+            this.dr.jobgrp = tbJobGrp.Text.Trim();
             this.dr.tag = tbTag.Text.Trim();
 
 
@@ -718,38 +774,36 @@ namespace FPJ0000.JobReport_
 
 
 
-        private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
+        //private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
-        {
+        //{
-            if (cmbType.Text.Trim() != "" &&
+        //    if (cmbType.Text.Trim() != "" &&
-                cmbType.SelectedIndex >= 0 &&
+        //        cmbType.SelectedIndex >= 0 &&
-                cmbProcess.SelectedIndex < 0 &&
+        //        cmbProcess.SelectedIndex < 0 &&
-                cmbUser.SelectedValue != null)
+        //        cmbUser.SelectedValue != null)
-            {
+        //    {
-                //공정을 자동선택해준다.
+        //        //공정을 자동선택해준다.
-                //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다.
+        //        //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다.
-                var uid = cmbUser.SelectedValue.ToString();
+        //        var uid = cmbUser.SelectedValue.ToString();
-                var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim());
+        //        var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim());
-                if (lastDt != null && lastDt.Rows.Count > 0)
+        //        if (lastDt != null && lastDt.Rows.Count > 0)
-                {
+        //        {
-                    var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
+        //            var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
-                    if (predr["process"] != DBNull.Value)
+        //            if (predr["process"] != DBNull.Value)
-                        cmbProcess.Text = predr["process"].ToString(); //190506
+        //                cmbProcess.Text = predr["process"].ToString(); //190506
-                }
+        //        }
 
-            }
+        //    }
-            chkform_indexchan(sender, e);
+        //    chkform_indexchan(sender, e);
 
-        }
+        //}
 
         void chkform_indexchan(object sender, EventArgs e)
         {
-            if (cmbType.Text.Trim() != "" &&
+            if (tbJobType.Text.isEmpty() == false && String.IsNullOrEmpty(cmbState.Text.Trim()) == false)
-           cmbType.SelectedIndex >= 0 && String.IsNullOrEmpty(cmbState.Text.Trim()) == false)
             {
 
-
                 //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
-                var formname = cmbType.Text.Trim() + "|" + cmbState.Text.Trim();
+                var formname = tbJobType.Text.Trim() + "|" + cmbState.Text.Trim();
                 var db = new EEEntities();
 
                 //프로젝트 제목 서포트
@@ -927,5 +981,34 @@ namespace FPJ0000.JobReport_
                 //}
             }
         }
+
+        private void cmbRequest_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbType_Click(object sender, EventArgs e)
+        {
+            var jobtype = tbJobType.Text.Trim();
+            var jobprc = tbJobProcess.Text.Trim();
+            var jobgrp = tbJobGrp.Text.Trim();
+            var fullname = $"{jobprc}|{jobgrp}|{jobtype}";
+            var auth = FCOMMON.info.Login.level >= 5;
+            using (var f = new FPJ0000.JobReport_.fJobProcessSelect(fullname, auth))
+                if (f.ShowDialog() == DialogResult.OK)
+                {
+                    //선택되면해야할일들
+                    var data = f.SelectedValue.Split('|');
+                    if (data.Length != 3) return;
+                    var prc = data[0].Trim();
+                    var grp = data[1].Trim();
+                    var itm = data[2].Trim();
+                    if (prc.isEmpty() || prc.Equals("(N/A)")) prc = "N/A";
+                    this.tbJobType.Text = itm;
+                    this.tbJobGrp.Text = grp;
+                    this.tbJobProcess.Text = prc;
+                    RefreshJobTypeFull();
+                }
+        }
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport_Add.resx

@@ -179,7 +179,7 @@
   </metadata>
   <data name="richTextBoxEx1.Rtf" xml:space="preserve">
     <value>{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Arial;}{\f1\froman\fcharset129 \'b8\'bc\'c0\'ba \'b0\'ed\'b5\'f1;}}
-{\*\generator Riched20 10.0.19041}\viewkind4\uc1 
+{\*\generator Riched20 10.0.22621}\viewkind4\uc1 
 \pard\fs20\lang1042 3. \f1\'c7\'c1\'b7\'ce\'c1\'a7\'c6\'ae\f0\lang1033  \f1\'c1\'a6\'b8\'f1\'c0\'ba\f0  (\f1\'b0\'f8\'c0\'e5\'b6\'f3\'c0\'ce\f0 ,PKG\f1\'b0\'f8\'c1\'a4\f0 /\f1\'c0\'e5\'ba\'f1\'b8\'ed\f0  \f1\'c1\'a6\'c1\'b6\'bb\'e7\f0 /\f1\'b8\'f0\'b5\'a8\'b8\'ed\f0  \f1\'c0\'e5\'ba\'f1\'b9\'f8\'c8\'a3\f0  \f1\'c1\'f6\'bf\'f8\'b3\'bb\'bf\'eb\f0 ) \f1\'c7\'fc\'bd\'c4\'c0\'b8\'b7\'ce\f0  \f1\'c0\'db\'bc\'ba\'c7\'d8\f0  \f1\'c1\'d6\'bc\'bc\'bf\'e4\f0 .\lang1042\par
 }
 </value>

SubProject/FPJ0000/dsJobReport.Designer.cs

@@ -3385,7 +3385,7 @@ ORDER BY name, pdate";
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
             this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) ORDER BY code";
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3399,7 +3399,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
             this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY code";
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3442,8 +3442,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             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  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate\r\nFROM   " +
+            this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Comm" +
-                "  Common WITH (nolock)\r\nWHERE  (gcode = @gcode) AND (grp = @grp)\r\nORDER BY code";
+                "on WITH (nolock) WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY code";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             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, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

SubProject/FPJ0000/dsJobReport.xsd

@@ -137,7 +137,7 @@ ORDER BY name, pdate</CommandText>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = SCOPE_IDENTITY()) ORDER BY code</CommandText>
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -153,10 +153,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate
+                    <CommandText>SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY code</CommandText>
-FROM     Common WITH (nolock)
-WHERE  (gcode = @gcode) AND (grp = @grp)
-ORDER BY code</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Common" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="grp" ColumnName="grp" DataSourceName="EE.dbo.Common" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -166,7 +163,7 @@ ORDER BY code</CommandText>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY code</CommandText>
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -193,7 +190,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Common" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -218,13 +215,13 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="dsJobReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="dsJobReport" msprop:Generator_DataSetName="dsJobReport">
+  <xs:element name="dsJobReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dsJobReport" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsJobReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="HolidayDateList" msprop:Generator_RowClassName="HolidayDateListRow" msprop:Generator_RowEvHandlerName="HolidayDateListRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayDateListRowDeleted" msprop:Generator_RowDeletingName="HolidayDateListRowDeleting" msprop:Generator_RowEvArgName="HolidayDateListRowChangeEvent" msprop:Generator_TablePropName="HolidayDateList" msprop:Generator_RowChangedName="HolidayDateListRowChanged" msprop:Generator_RowChangingName="HolidayDateListRowChanging" msprop:Generator_TableClassName="HolidayDateListDataTable" msprop:Generator_UserTableName="HolidayDateList" msprop:Generator_TableVarName="tableHolidayDateList">
+        <xs:element name="HolidayDateList" msprop:Generator_RowEvHandlerName="HolidayDateListRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayDateListRowDeleted" msprop:Generator_RowDeletingName="HolidayDateListRowDeleting" msprop:Generator_RowEvArgName="HolidayDateListRowChangeEvent" msprop:Generator_TablePropName="HolidayDateList" msprop:Generator_RowChangedName="HolidayDateListRowChanged" msprop:Generator_UserTableName="HolidayDateList" msprop:Generator_RowChangingName="HolidayDateListRowChanging" msprop:Generator_RowClassName="HolidayDateListRow" msprop:Generator_TableClassName="HolidayDateListDataTable" msprop:Generator_TableVarName="tableHolidayDateList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -234,10 +231,10 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_TableVarName="tablevJobReportForUser">
+        <xs:element name="vJobReportForUser" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -338,8 +335,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="otStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_UserColumnName="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="otEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_UserColumnName="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" type="xs:dateTime" minOccurs="0" />
               <xs:element name="ot2" msprop:Generator_ColumnPropNameInTable="ot2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot2" msprop:Generator_UserColumnName="ot2" msprop:Generator_ColumnVarNameInTable="columnot2" type="xs:double" minOccurs="0" />
               <xs:element name="otReason" msprop:Generator_ColumnPropNameInTable="otReasonColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="otReason" msprop:Generator_UserColumnName="otReason" msprop:Generator_ColumnVarNameInTable="columnotReason" minOccurs="0">
                 <xs:simpleType>
@@ -372,10 +369,10 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Common" msprop:Generator_RowClassName="CommonRow" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_TablePropName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_UserTableName="Common" msprop:Generator_TableVarName="tableCommon">
+        <xs:element name="Common" msprop:Generator_RowEvHandlerName="CommonRowChangeEventHandler" msprop:Generator_RowDeletedName="CommonRowDeleted" msprop:Generator_RowDeletingName="CommonRowDeleting" msprop:Generator_RowEvArgName="CommonRowChangeEvent" msprop:Generator_TablePropName="Common" msprop:Generator_RowChangedName="CommonRowChanged" msprop:Generator_UserTableName="Common" msprop:Generator_RowChangingName="CommonRowChanging" msprop:Generator_RowClassName="CommonRow" msprop:Generator_TableClassName="CommonDataTable" msprop:Generator_TableVarName="tableCommon">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -420,7 +417,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/dsJobReport.xss

@@ -4,9 +4,9 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="3" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:HolidayDateList" ZOrder="3" X="29" Y="208" Height="96" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:HolidayDateList" ZOrder="3" X="39" Y="135" Height="96" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
     <Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="13" Y="321" Height="343" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:Common" ZOrder="1" X="266" Y="226" Height="267" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
   </Shapes>

SubProject/FPJ0000/dsPRJ.Designer.cs

@@ -11080,6 +11080,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnWeekName;
             
+            private global::System.Data.DataColumn columnjobgrp;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public JobReportDataTable() {
@@ -11393,6 +11395,14 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn jobgrpColumn {
+                get {
+                    return this.columnjobgrp;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -11464,7 +11474,8 @@ namespace FPJ0000 {
                         bool FreeDay, 
                         string otwuid, 
                         System.DateTime ottime, 
-                        string WeekName) {
+                        string WeekName, 
+                        string jobgrp) {
                 JobReportRow rowJobReportRow = ((JobReportRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         gcode,
@@ -11501,7 +11512,8 @@ namespace FPJ0000 {
                         FreeDay,
                         otwuid,
                         ottime,
-                        WeekName};
+                        WeekName,
+                        jobgrp};
                 rowJobReportRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowJobReportRow);
                 return rowJobReportRow;
@@ -11567,6 +11579,7 @@ namespace FPJ0000 {
                 this.columnotwuid = base.Columns["otwuid"];
                 this.columnottime = base.Columns["ottime"];
                 this.columnWeekName = base.Columns["WeekName"];
+                this.columnjobgrp = base.Columns["jobgrp"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -11642,6 +11655,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnottime);
                 this.columnWeekName = new global::System.Data.DataColumn("WeekName", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnWeekName);
+                this.columnjobgrp = new global::System.Data.DataColumn("jobgrp", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnjobgrp);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columngcode,
                                 this.columnidx}, true));
@@ -11680,6 +11695,7 @@ namespace FPJ0000 {
                 this.columnotwuid.MaxLength = 20;
                 this.columnWeekName.ReadOnly = true;
                 this.columnWeekName.MaxLength = 10;
+                this.columnjobgrp.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -23196,6 +23212,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string jobgrp {
+                get {
+                    if (this.IsjobgrpNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableJobReport.jobgrpColumn]));
+                    }
+                }
+                set {
+                    this[this.tableJobReport.jobgrpColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IspidxNull() {
@@ -23567,6 +23599,18 @@ namespace FPJ0000 {
             public void SetWeekNameNull() {
                 this[this.tableJobReport.WeekNameColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsjobgrpNull() {
+                return this.IsNull(this.tableJobReport.jobgrpColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetjobgrpNull() {
+                this[this.tableJobReport.jobgrpColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -39641,6 +39685,7 @@ SELECT idx, gcode, pidx, pseq, pdate, remark, remark2, wuid, wdate, no FROM EETG
             tableMapping.ColumnMappings.Add("otwuid", "otwuid");
             tableMapping.ColumnMappings.Add("ottime", "ottime");
             tableMapping.ColumnMappings.Add("WeekName", "WeekName");
+            tableMapping.ColumnMappings.Add("jobgrp", "jobgrp");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -39670,7 +39715,8 @@ SELECT idx, gcode, pidx, pseq, pdate, remark, remark2, wuid, wdate, no FROM EETG
                 "t2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Origin" +
                 "al_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Ori" +
                 "ginal_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Or" +
-                "iginal_ottime)))";
+                "iginal_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @O" +
+                "riginal_jobgrp)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -39724,10 +39770,12 @@ SELECT idx, gcode, pidx, pseq, pdate, remark, remark2, wuid, wdate, no FROM EETG
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ottime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobgrp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp);
-SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
+SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -39758,48 +39806,137 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE JobReport
+            this._adapter.UpdateCommand.CommandText = "UPDATE [JobReport] SET [gcode] = @gcode, [pidx] = @pidx, [pdate] = @pdate, [uid] " +
-SET        gcode = @gcode, pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, 
+                "= @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, " +
-               remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag, 
+                "[type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, " +
-               otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason, otwuid = @otwuid, 
+                "[import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectNa" +
-               ottime = @ottime
+                "me, [ot] = @ot, [process] = @process, [description2] = @description2, [tag] = @t" +
-WHERE  (gcode = @Original_gcode) AND (idx = @Original_idx); 
+                "ag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput, [kisullv] " +
-SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC";
+                "= @kisullv, [kisuldiv] = @kisuldiv, [kisulamt] = @kisulamt, [ot2] = @ot2, [otRea" +
+                "son] = @otReason, [otwuid] = @otwuid, [ottime] = @ottime, [jobgrp] = @jobgrp WHE" +
+                "RE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx =" +
+                " 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND" +
+                " [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid" +
+                "] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [reques" +
+                "tpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_packag" +
+                "e = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_s" +
+                "tatus = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_" +
+                "type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark " +
+                "= 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = " +
+                "1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [i" +
+                "mport] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) " +
+                "AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] " +
+                "IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [o" +
+                "t] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS" +
+                " NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NU" +
+                "LL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL)" +
+                " OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL" +
+                ") OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS" +
+                " NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [ki" +
+                "sullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 A" +
+                "ND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisul" +
+                "amt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsN" +
+                "ull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReaso" +
+                "n = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNul" +
+                "l_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNu" +
+                "ll_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)) AND ((@IsN" +
+                "ull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)));\r\nSELECT" +
+                " gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, " +
+                "remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName," +
+                " ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue" +
+                "(gcode, \'15\', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kis" +
+                "ulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWe" +
+                "ekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx" +
+                " = @idx) ORDER BY pdate DESC";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@description2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "description2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisullv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisuldiv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kisulamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ot2", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_requestpart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_requestpart", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "requestpart", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_package", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_package", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "package", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_type", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "type", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_remark", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_remark", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_hrs", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_hrs", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "hrs", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_projectName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_projectName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "projectName", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tag", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tag", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tag", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otStart", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otStart", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otStart", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otEnd", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otEnd", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otEnd", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_autoinput", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_autoinput", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisullv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisullv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisullv", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisuldiv", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisuldiv", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisuldiv", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_kisulamt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kisulamt", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_kisulamt", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 3, "kisulamt", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ot2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ot2", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ot2", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otReason", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otReason", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otReason", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_otwuid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_otwuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "otwuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ottime", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ottime", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ottime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobgrp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobgrp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobgrp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -39817,7 +39954,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) 
                AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, 
-               otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName
+               otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp
 FROM     JobReport
 WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
 ORDER BY pdate DESC";
@@ -39985,7 +40122,8 @@ ORDER BY pdate DESC";
                     global::System.Nullable<double> Original_ot2, 
                     string Original_otReason, 
                     string Original_otwuid, 
-                    global::System.Nullable<global::System.DateTime> Original_ottime) {
+                    global::System.Nullable<global::System.DateTime> Original_ottime, 
+                    string Original_jobgrp) {
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
@@ -40192,6 +40330,14 @@ ORDER BY pdate DESC";
                 this.Adapter.DeleteCommand.Parameters[50].Value = ((object)(1));
                 this.Adapter.DeleteCommand.Parameters[51].Value = global::System.DBNull.Value;
             }
+            if ((Original_jobgrp == null)) {
+                this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[53].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[52].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[53].Value = ((string)(Original_jobgrp));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -40241,7 +40387,8 @@ ORDER BY pdate DESC";
                     global::System.Nullable<double> ot2, 
                     string otReason, 
                     string otwuid, 
-                    global::System.Nullable<global::System.DateTime> ottime) {
+                    global::System.Nullable<global::System.DateTime> ottime, 
+                    string jobgrp) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
@@ -40411,6 +40558,12 @@ ORDER BY pdate DESC";
             else {
                 this.Adapter.InsertCommand.Parameters[28].Value = global::System.DBNull.Value;
             }
+            if ((jobgrp == null)) {
+                this.Adapter.InsertCommand.Parameters[29].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[29].Value = ((string)(jobgrp));
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -40461,8 +40614,36 @@ ORDER BY pdate DESC";
                     string otReason, 
                     string otwuid, 
                     global::System.Nullable<global::System.DateTime> ottime, 
+                    string jobgrp, 
                     string Original_gcode, 
                     int Original_idx, 
+                    global::System.Nullable<int> Original_pidx, 
+                    string Original_pdate, 
+                    string Original_uid, 
+                    string Original_requestpart, 
+                    string Original_package, 
+                    string Original_status, 
+                    string Original_type, 
+                    string Original_remark, 
+                    global::System.Nullable<double> Original_hrs, 
+                    global::System.Nullable<bool> Original_import, 
+                    string Original_wuid, 
+                    System.DateTime Original_wdate, 
+                    string Original_projectName, 
+                    global::System.Nullable<double> Original_ot, 
+                    string Original_process, 
+                    string Original_tag, 
+                    global::System.Nullable<global::System.DateTime> Original_otStart, 
+                    global::System.Nullable<global::System.DateTime> Original_otEnd, 
+                    global::System.Nullable<bool> Original_autoinput, 
+                    string Original_kisullv, 
+                    string Original_kisuldiv, 
+                    global::System.Nullable<decimal> Original_kisulamt, 
+                    global::System.Nullable<double> Original_ot2, 
+                    string Original_otReason, 
+                    string Original_otwuid, 
+                    global::System.Nullable<global::System.DateTime> Original_ottime, 
+                    string Original_jobgrp, 
                     int idx) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
@@ -40633,14 +40814,227 @@ ORDER BY pdate DESC";
             else {
                 this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
             }
+            if ((jobgrp == null)) {
+                this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(jobgrp));
+            }
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_gcode));
             }
-            this.Adapter.UpdateCommand.Parameters[30].Value = ((int)(Original_idx));
+            this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx));
-            this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(idx));
+            if ((Original_pidx.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_pidx.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
+            }
+            if ((Original_pdate == null)) {
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_pdate));
+            }
+            if ((Original_uid == null)) {
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid));
+            }
+            if ((Original_requestpart == null)) {
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_requestpart));
+            }
+            if ((Original_package == null)) {
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_package));
+            }
+            if ((Original_status == null)) {
+                this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_status));
+            }
+            if ((Original_type == null)) {
+                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[45].Value = ((string)(Original_type));
+            }
+            if ((Original_remark == null)) {
+                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[47].Value = ((string)(Original_remark));
+            }
+            if ((Original_hrs.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[49].Value = ((double)(Original_hrs.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value;
+            }
+            if ((Original_import.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[51].Value = ((bool)(Original_import.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[50].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[51].Value = global::System.DBNull.Value;
+            }
+            if ((Original_wuid == null)) {
+                throw new global::System.ArgumentNullException("Original_wuid");
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_wuid));
+            }
+            this.Adapter.UpdateCommand.Parameters[53].Value = ((System.DateTime)(Original_wdate));
+            if ((Original_projectName == null)) {
+                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_projectName));
+            }
+            if ((Original_ot.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[57].Value = ((double)(Original_ot.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value;
+            }
+            if ((Original_process == null)) {
+                this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_process));
+            }
+            if ((Original_tag == null)) {
+                this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[60].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[61].Value = ((string)(Original_tag));
+            }
+            if ((Original_otStart.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[63].Value = ((System.DateTime)(Original_otStart.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[62].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[63].Value = global::System.DBNull.Value;
+            }
+            if ((Original_otEnd.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[65].Value = ((System.DateTime)(Original_otEnd.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[64].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[65].Value = global::System.DBNull.Value;
+            }
+            if ((Original_autoinput.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[67].Value = ((bool)(Original_autoinput.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[66].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[67].Value = global::System.DBNull.Value;
+            }
+            if ((Original_kisullv == null)) {
+                this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[69].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[68].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[69].Value = ((string)(Original_kisullv));
+            }
+            if ((Original_kisuldiv == null)) {
+                this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[71].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[70].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_kisuldiv));
+            }
+            if ((Original_kisulamt.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[73].Value = ((decimal)(Original_kisulamt.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[72].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[73].Value = global::System.DBNull.Value;
+            }
+            if ((Original_ot2.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[75].Value = ((double)(Original_ot2.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[74].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[75].Value = global::System.DBNull.Value;
+            }
+            if ((Original_otReason == null)) {
+                this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[77].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[76].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[77].Value = ((string)(Original_otReason));
+            }
+            if ((Original_otwuid == null)) {
+                this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[79].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[78].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[79].Value = ((string)(Original_otwuid));
+            }
+            if ((Original_ottime.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[81].Value = ((System.DateTime)(Original_ottime.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[80].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[81].Value = global::System.DBNull.Value;
+            }
+            if ((Original_jobgrp == null)) {
+                this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[83].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[82].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[83].Value = ((string)(Original_jobgrp));
+            }
+            this.Adapter.UpdateCommand.Parameters[84].Value = ((int)(idx));
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -40690,10 +41084,37 @@ ORDER BY pdate DESC";
                     string otReason, 
                     string otwuid, 
                     global::System.Nullable<global::System.DateTime> ottime, 
+                    string jobgrp, 
                     string Original_gcode, 
                     int Original_idx, 
-                    int idx) {
+                    global::System.Nullable<int> Original_pidx, 
-            return this.Update(Original_gcode, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, description2, tag, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, otwuid, ottime, Original_gcode, Original_idx, idx);
+                    string Original_pdate, 
+                    string Original_uid, 
+                    string Original_requestpart, 
+                    string Original_package, 
+                    string Original_status, 
+                    string Original_type, 
+                    string Original_remark, 
+                    global::System.Nullable<double> Original_hrs, 
+                    global::System.Nullable<bool> Original_import, 
+                    string Original_wuid, 
+                    System.DateTime Original_wdate, 
+                    string Original_projectName, 
+                    global::System.Nullable<double> Original_ot, 
+                    string Original_process, 
+                    string Original_tag, 
+                    global::System.Nullable<global::System.DateTime> Original_otStart, 
+                    global::System.Nullable<global::System.DateTime> Original_otEnd, 
+                    global::System.Nullable<bool> Original_autoinput, 
+                    string Original_kisullv, 
+                    string Original_kisuldiv, 
+                    global::System.Nullable<decimal> Original_kisulamt, 
+                    global::System.Nullable<double> Original_ot2, 
+                    string Original_otReason, 
+                    string Original_otwuid, 
+                    global::System.Nullable<global::System.DateTime> Original_ottime, 
+                    string Original_jobgrp) {
+            return this.Update(Original_gcode, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, projectName, ot, process, description2, tag, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, otwuid, ottime, jobgrp, Original_gcode, Original_idx, Original_pidx, Original_pdate, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_remark, Original_hrs, Original_import, Original_wuid, Original_wdate, Original_projectName, Original_ot, Original_process, Original_tag, Original_otStart, Original_otEnd, Original_autoinput, Original_kisullv, Original_kisuldiv, Original_kisulamt, Original_ot2, Original_otReason, Original_otwuid, Original_ottime, Original_jobgrp, Original_idx);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

SubProject/FPJ0000/dsPRJ.xsd

@@ -2681,7 +2681,7 @@ ORDER BY name</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.JobReport" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [JobReport] WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)))</CommandText>
+                    <CommandText>DELETE FROM [JobReport] WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -2735,13 +2735,15 @@ ORDER BY name</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ottime" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime);
+                    <CommandText>INSERT INTO [JobReport] ([gcode], [pidx], [pdate], [uid], [requestpart], [package], [status], [type], [description], [remark], [hrs], [import], [wuid], [wdate], [projectName], [ot], [process], [description2], [tag], [otStart], [otEnd], [autoinput], [kisullv], [kisuldiv], [kisulamt], [ot2], [otReason], [otwuid], [ottime], [jobgrp]) VALUES (@gcode, @pidx, @pdate, @uid, @requestpart, @package, @status, @type, @description, @remark, @hrs, @import, @wuid, @wdate, @projectName, @ot, @process, @description2, @tag, @otStart, @otEnd, @autoinput, @kisullv, @kisuldiv, @kisulamt, @ot2, @otReason, @otwuid, @ottime, @jobgrp);
-SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText>
+SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2772,14 +2774,15 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) 
                AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, 
-               otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName
+               otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp
 FROM     JobReport
 WHERE  (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid) AND (gcode = @gcode)
 ORDER BY pdate DESC</CommandText>
@@ -2792,47 +2795,95 @@ ORDER BY pdate DESC</CommandText>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE JobReport
+                    <CommandText>UPDATE [JobReport] SET [gcode] = @gcode, [pidx] = @pidx, [pdate] = @pdate, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [description] = @description, [remark] = @remark, [hrs] = @hrs, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [projectName] = @projectName, [ot] = @ot, [process] = @process, [description2] = @description2, [tag] = @tag, [otStart] = @otStart, [otEnd] = @otEnd, [autoinput] = @autoinput, [kisullv] = @kisullv, [kisuldiv] = @kisuldiv, [kisulamt] = @kisulamt, [ot2] = @ot2, [otReason] = @otReason, [otwuid] = @otwuid, [ottime] = @ottime, [jobgrp] = @jobgrp WHERE (([gcode] = @Original_gcode) AND ([idx] = @Original_idx) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_otStart = 1 AND [otStart] IS NULL) OR ([otStart] = @Original_otStart)) AND ((@IsNull_otEnd = 1 AND [otEnd] IS NULL) OR ([otEnd] = @Original_otEnd)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_kisullv = 1 AND [kisullv] IS NULL) OR ([kisullv] = @Original_kisullv)) AND ((@IsNull_kisuldiv = 1 AND [kisuldiv] IS NULL) OR ([kisuldiv] = @Original_kisuldiv)) AND ((@IsNull_kisulamt = 1 AND [kisulamt] IS NULL) OR ([kisulamt] = @Original_kisulamt)) AND ((@IsNull_ot2 = 1 AND [ot2] IS NULL) OR ([ot2] = @Original_ot2)) AND ((@IsNull_otReason = 1 AND [otReason] IS NULL) OR ([otReason] = @Original_otReason)) AND ((@IsNull_otwuid = 1 AND [otwuid] IS NULL) OR ([otwuid] = @Original_otwuid)) AND ((@IsNull_ottime = 1 AND [ottime] IS NULL) OR ([ottime] = @Original_ottime)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)));
-SET        gcode = @gcode, pidx = @pidx, pdate = @pdate, uid = @uid, requestpart = @requestpart, package = @package, status = @status, type = @type, description = @description, 
+SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName, jobgrp FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC</CommandText>
-               remark = @remark, hrs = @hrs, import = @import, wuid = @wuid, wdate = @wdate, projectName = @projectName, ot = @ot, process = @process, description2 = @description2, tag = @tag, 
-               otStart = @otStart, otEnd = @otEnd, autoinput = @autoinput, kisullv = @kisullv, kisuldiv = @kisuldiv, kisulamt = @kisulamt, ot2 = @ot2, otReason = @otReason, otwuid = @otwuid, 
-               ottime = @ottime
-WHERE  (gcode = @Original_gcode) AND (idx = @Original_idx); 
-SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, description, remark, hrs, import, wuid, wdate, dbo.getUserName(uid) AS username, projectName, ot, dbo.getWorkWeek(pdate) AS ww, process, description2, tag, dbo.getCodeSValue(gcode, '15', type) AS svalue, otStart, otEnd, autoinput, kisullv, kisuldiv, kisulamt, ot2, otReason, dbo.IsHoliday(pdate) AS FreeDay, otwuid, ottime, dbo.GetWeekName(pdate) AS WeekName FROM JobReport WHERE (gcode = @gcode) AND (idx = @idx) ORDER BY pdate DESC</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="requestpart" ColumnName="requestpart" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="package" ColumnName="package" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="description" ColumnName="description" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="remark" ColumnName="remark" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="hrs" ColumnName="hrs" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.JobReport" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="projectName" ColumnName="projectName" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ot" ColumnName="ot" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="description2" ColumnName="description2" DataSourceName="EE.dbo.JobReport" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@description2" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="description2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="tag" ColumnName="tag" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="otStart" ColumnName="otStart" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="otEnd" ColumnName="otEnd" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="autoinput" ColumnName="autoinput" DataSourceName="EE.dbo.JobReport" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="kisullv" ColumnName="kisullv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="kisuldiv" ColumnName="kisuldiv" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="kisulamt" ColumnName="kisulamt" DataSourceName="EE.dbo.JobReport" DataTypeServer="decimal(18, 3)" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="9" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ot2" ColumnName="ot2" DataSourceName="EE.dbo.JobReport" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@ot2" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="otReason" ColumnName="otReason" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="otwuid" ColumnName="otwuid" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ottime" ColumnName="ottime" DataSourceName="EE.dbo.JobReport" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_requestpart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_requestpart" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="requestpart" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_package" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_package" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="package" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_remark" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_remark" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="remark" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_hrs" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_hrs" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="hrs" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_projectName" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_projectName" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="projectName" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_tag" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_tag" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tag" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otStart" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otStart" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otStart" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otEnd" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_otEnd" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="otEnd" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_autoinput" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_autoinput" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisullv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisullv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisullv" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisuldiv" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_kisuldiv" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="kisuldiv" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_kisulamt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_kisulamt" Precision="18" ProviderType="Decimal" Scale="3" Size="0" SourceColumn="kisulamt" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ot2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_ot2" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="ot2" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otReason" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otReason" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otReason" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_otwuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_otwuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="otwuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ottime" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ottime" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ottime" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobgrp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_jobgrp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="jobgrp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.JobReport" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -2874,6 +2925,7 @@ SELECT gcode, idx, pidx, pdate, uid, requestpart, package, status, type, descrip
               <Mapping SourceColumn="otwuid" DataSetColumn="otwuid" />
               <Mapping SourceColumn="ottime" DataSetColumn="ottime" />
               <Mapping SourceColumn="WeekName" DataSetColumn="WeekName" />
+              <Mapping SourceColumn="jobgrp" DataSetColumn="jobgrp" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckOt2Input" Modifier="Public" Name="CheckOt2Input" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckOt2Input">
@@ -3779,7 +3831,7 @@ WHERE  (idx = @idx)</CommandText>
               <xs:element name="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_UserColumnName="import" msprop:Generator_ColumnVarNameInTable="columnimport" type="xs:boolean" minOccurs="0" />
               <xs:element name="qtyn" msprop:Generator_ColumnPropNameInTable="qtynColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="qtyn" msprop:Generator_UserColumnName="qtyn" msprop:Generator_ColumnVarNameInTable="columnqtyn" type="xs:int" minOccurs="0" />
               <xs:element name="amtn" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amtn" msprop:Generator_UserColumnName="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" type="xs:decimal" minOccurs="0" />
-              <xs:element name="priceD" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="priceDColumn" msprop:Generator_ColumnVarNameInTable="columnpriceD" msprop:Generator_UserColumnName="priceD" msprop:Generator_ColumnPropNameInRow="priceD" type="xs:decimal" minOccurs="0" />
+              <xs:element name="priceD" msprop:Generator_ColumnPropNameInTable="priceDColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="priceD" msprop:Generator_UserColumnName="priceD" msprop:Generator_ColumnVarNameInTable="columnpriceD" type="xs:decimal" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -5146,6 +5198,13 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="jobgrp" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="jobgrpColumn" msprop:Generator_ColumnVarNameInTable="columnjobgrp" msprop:Generator_UserColumnName="jobgrp" msprop:Generator_ColumnPropNameInRow="jobgrp" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/dsPRJ.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="4" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="1136" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Projects" ZOrder="8" X="388" Y="651" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ProjectsIOMap" ZOrder="14" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
@@ -22,10 +22,10 @@
     <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="6" X="1574" Y="32" Height="305" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_ProjectReson" ZOrder="13" X="1561" Y="590" Height="267" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
     <Shape ID="DesignTable:vJobReportForUserList" ZOrder="9" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:JobReport" ZOrder="4" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:JobReport" ZOrder="1" X="1916" Y="400" Height="362" Width="259" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEETGW_Project_LayoutList" ZOrder="3" X="1257" Y="353" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
+    <Shape ID="DesignTable:vEETGW_Project_LayoutList" ZOrder="4" X="1257" Y="353" Height="187" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
-    <Shape ID="DesignTable:EETGW_Project_Layout" ZOrder="2" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
+    <Shape ID="DesignTable:EETGW_Project_Layout" ZOrder="3" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
-    <Shape ID="DesignTable:SCTable" ZOrder="1" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:SCTable" ZOrder="2" X="76" Y="362" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="19" X="2138" Y="50" Height="68" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
   </Shapes>
   <Connectors />