1. 업무일지 작업형태 선택 ui 변경

2. 작업형태 목록 편집 UI 추가
3. 스케쥴 관련메일 발송주기를 15분에서 30분으로 변경하고 18시 이후에는 발송하지 않게 한다(최근 오류메세지가 수신된다)

Project/StateMachine/_BW.cs

@@ -93,7 +93,7 @@ namespace Project
 
                     ///스케쥴 기한 알림(주)
                     var tsScheDayweek = DateTime.Now - ChkMakeSchDayWeekTime;
-                    if (tsScheDayweek.TotalMinutes > 15 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 10)
+                    if (tsScheDayweek.TotalMinutes > 30 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 10 && DateTime.Now.Hour <= 18)
                     {
 
                         try { Mail_MakeScheduleDayWeek(); }
@@ -103,8 +103,8 @@ namespace Project
 
                     ///스케쥴 기한 알림(일)
                     var tsScheDay = DateTime.Now - ChkMakeSchDay;
-                    if (tsScheDay.TotalMinutes > 15 && DateTime.Now.DayOfWeek != DayOfWeek.Saturday &&
+                    if (tsScheDay.TotalMinutes > 30 && DateTime.Now.DayOfWeek != DayOfWeek.Saturday &&
-                        DateTime.Now.DayOfWeek != DayOfWeek.Sunday && DateTime.Now.Hour >= 10)
+                        DateTime.Now.DayOfWeek != DayOfWeek.Sunday && DateTime.Now.Hour >= 10 && DateTime.Now.Hour <= 18)
                     {
 
                         try { Mail_MakeScheduleDay(); }
@@ -114,7 +114,7 @@ namespace Project
 
                     ///스케쥴없음
                     var tsNoSchedule = DateTime.Now - ChkNoSchedule;
-                    if (tsNoSchedule.TotalMinutes > 15 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 10)
+                    if (tsNoSchedule.TotalMinutes > 30 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 10 && DateTime.Now.Hour <= 18)
                     {
 
                         try { Mail_NoSchedule(); }
@@ -124,7 +124,7 @@ namespace Project
 
                     ///업무일지(주간)
                     var tsjobweek = DateTime.Now - ChkJObreportWeek;
-                    if (tsjobweek.TotalMinutes > 15 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 9)
+                    if (tsjobweek.TotalMinutes > 30 && DateTime.Now.DayOfWeek == DayOfWeek.Monday && DateTime.Now.Hour >= 9 && DateTime.Now.Hour <= 18)
                     {
 
                         try { Mail_JobReportWeek(); }
@@ -138,7 +138,7 @@ namespace Project
                         DateTime.Now.DayOfWeek != DayOfWeek.Saturday &&
                         DateTime.Now.DayOfWeek != DayOfWeek.Sunday &&
                         DateTime.Now.DayOfWeek != DayOfWeek.Monday &&
-                        DateTime.Now.Hour >= 9)
+                        DateTime.Now.Hour >= 9 && DateTime.Now.Hour <= 18)
                     {
 
                         try { Mail_JobReportDay(); }

SubProject/FCM0000/fCode.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fCode));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
             this.cmbList = new System.Windows.Forms.ComboBox();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
@@ -65,6 +65,7 @@
             this.ta = new FCM0000.dsMSSQLTableAdapters.CommonTableAdapter();
             this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
             this.tbFind = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -316,20 +317,20 @@
             this.dataGridViewTextBoxColumn5,
             this.dataGridViewTextBoxColumn6});
             this.commonDataGridView.DataSource = this.bs;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
+            dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 3);
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.commonDataGridView.DefaultCellStyle = dataGridViewCellStyle3;
+            this.commonDataGridView.DefaultCellStyle = dataGridViewCellStyle1;
             this.commonDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.commonDataGridView.Location = new System.Drawing.Point(0, 48);
+            this.commonDataGridView.Location = new System.Drawing.Point(0, 90);
             this.commonDataGridView.Name = "commonDataGridView";
             this.commonDataGridView.RowTemplate.Height = 23;
-            this.commonDataGridView.Size = new System.Drawing.Size(817, 606);
+            this.commonDataGridView.Size = new System.Drawing.Size(817, 564);
             this.commonDataGridView.TabIndex = 3;
             this.commonDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.commonDataGridView_CellContentClick);
             this.commonDataGridView.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.commonDataGridView_CellDoubleClick);
@@ -402,12 +403,25 @@
             this.tbFind.TextChanged += new System.EventHandler(this.tbFind_TextChanged);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
             // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.Gold;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(0, 48);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(817, 42);
+            this.label1.TabIndex = 5;
+            this.label1.Text = "코드값이 없다면 목록에서 노출되지 않습니다";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // fCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(817, 718);
             this.Controls.Add(this.commonDataGridView);
+            this.Controls.Add(this.label1);
             this.Controls.Add(this.tbFind);
             this.Controls.Add(this.bn);
             this.Controls.Add(this.panel1);
@@ -466,5 +480,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.ToolStripButton btCancle;
         private System.Windows.Forms.TextBox tbFind;
+        private System.Windows.Forms.Label label1;
     }
 }

SubProject/FCM0000/fCode.resx

@@ -124,7 +124,7 @@
   <data name="btAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/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
@@ -142,7 +142,7 @@
   <data name="btDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -154,7 +154,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/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
@@ -165,7 +165,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/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
@@ -174,7 +174,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -183,7 +183,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/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
@@ -194,7 +194,7 @@
   <data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        vwAADr8BOAVTJAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
@@ -239,9 +239,6 @@
         J+O97B4lAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>186, 17</value>
   </metadata>

SubProject/FCOMMON/FCOMMON.csproj

@@ -36,6 +36,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="arControl.Net4">
+      <HintPath>..\..\Sub\arCtl\obj\Debug\arControl.Net4.dll</HintPath>
+    </Reference>
     <Reference Include="ArSetting.Net4">
       <HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
     </Reference>
@@ -116,6 +119,12 @@
     <Compile Include="fInputTextBox.Designer.cs">
       <DependentUpon>fInputTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="fLOV.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="fLOV.Designer.cs">
+      <DependentUpon>fLOV.cs</DependentUpon>
+    </Compile>
     <Compile Include="fLovDateList.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -187,6 +196,9 @@
     <EmbeddedResource Include="fInputTextBox.resx">
       <DependentUpon>fInputTextBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="fLOV.resx">
+      <DependentUpon>fLOV.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="fLovDateList.resx">
       <DependentUpon>fLovDateList.cs</DependentUpon>
     </EmbeddedResource>

SubProject/FCOMMON/fLOV.Designer.cs

@@ -0,0 +1,103 @@
+namespace FCOMMON
+{
+    partial class fLOV
+    {
+        /// <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.dv = new arCtl.arDatagridView();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.btSelect = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dv
+            // 
+            this.dv.A_DelCurrentCell = true;
+            this.dv.A_EnterToTab = true;
+            this.dv.A_KoreanField = null;
+            this.dv.A_UpperField = null;
+            this.dv.A_ViewRownumOnHeader = true;
+            this.dv.AllowUserToAddRows = false;
+            this.dv.AllowUserToDeleteRows = false;
+            this.dv.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dv.ColumnHeadersVisible = false;
+            this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Column1});
+            this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dv.Location = new System.Drawing.Point(0, 0);
+            this.dv.MultiSelect = false;
+            this.dv.Name = "dv";
+            this.dv.ReadOnly = true;
+            this.dv.RowTemplate.Height = 23;
+            this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dv.Size = new System.Drawing.Size(385, 388);
+            this.dv.TabIndex = 0;
+            this.dv.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.arDatagridView1_CellDoubleClick);
+            // 
+            // Column1
+            // 
+            this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Column1.HeaderText = "Column1";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            // 
+            // 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(0, 388);
+            this.btSelect.Name = "btSelect";
+            this.btSelect.Size = new System.Drawing.Size(385, 54);
+            this.btSelect.TabIndex = 6;
+            this.btSelect.Text = "선택 완료";
+            this.btSelect.UseVisualStyleBackColor = true;
+            this.btSelect.Click += new System.EventHandler(this.btSelect_Click);
+            // 
+            // fLOV
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(385, 442);
+            this.Controls.Add(this.dv);
+            this.Controls.Add(this.btSelect);
+            this.Name = "fLOV";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "List of value";
+            this.Load += new System.EventHandler(this.fLOV_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private arCtl.arDatagridView dv;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.Button btSelect;
+    }
+}

SubProject/FCOMMON/fLOV.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FCOMMON
+{
+    public partial class fLOV : Form
+    {
+        public fLOV(string[] list,string defitem = "")
+        {
+            InitializeComponent();
+
+            this.dv.Rows.Clear();
+            foreach(var item in list)
+            {
+                dv.Rows.Add(new object[] { item });
+            }
+        }
+
+        private void fLOV_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void arDatagridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            FeedBack();
+        }
+
+        private void btSelect_Click(object sender, EventArgs e)
+        {
+            FeedBack();
+        }
+
+        void FeedBack()
+        {
+            if (dv.SelectedCells.Count < 1) return;
+            this.SelectedValue = dv.SelectedCells[0].Value.ToString();
+            DialogResult = DialogResult.OK;
+        }
+        public string SelectedValue { get; set; }
+    }
+}

SubProject/FCOMMON/fLOV.resx

@@ -0,0 +1,123 @@
+<?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="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

SubProject/FPJ0000/FPJ0000.csproj

@@ -285,12 +285,6 @@
     <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>
@@ -687,9 +681,6 @@
     <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_/fJobProcessSelect.Designer.cs

@@ -30,12 +30,10 @@
         {
             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();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dsJobReport = new FPJ0000.dsJobReport();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.btDelete = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -48,10 +46,13 @@
             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.클립보드에서ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            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.svalue2 = 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();
@@ -63,51 +64,40 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.button2 = new System.Windows.Forms.Button();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.tbProcessI = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
             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.tbProcessE = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             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();
+            this.ta = new FPJ0000.dsJobReportTableAdapters.CommonTableAdapter();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            this.tam = new FPJ0000.dsJobReportTableAdapters.TableAdapterManager();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button3 = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).BeginInit();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
+            this.panel2.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;
@@ -115,6 +105,7 @@
             this.bn.CountItem = this.bindingNavigatorCountItem;
             this.bn.DeleteItem = this.btDelete;
             this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bn.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.bindingNavigatorMoveFirstItem,
             this.bindingNavigatorMovePreviousItem,
@@ -128,21 +119,32 @@
             this.btDelete,
             this.btSave,
             this.btImport});
-            this.bn.Location = new System.Drawing.Point(10, 706);
+            this.bn.Location = new System.Drawing.Point(10, 692);
             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.Size = new System.Drawing.Size(556, 39);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
+            // bs
+            // 
+            this.bs.DataMember = "Common";
+            this.bs.DataSource = this.dsJobReport;
+            this.bs.Sort = "svalue,memo";
+            // 
+            // dsJobReport
+            // 
+            this.dsJobReport.DataSetName = "dsJobReport";
+            this.dsJobReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
-            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36);
             this.bindingNavigatorCountItem.Text = "/{0}";
             this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
             // 
@@ -151,7 +153,7 @@
             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.Size = new System.Drawing.Size(67, 36);
             this.btDelete.Text = "삭제";
             this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
             // 
@@ -161,7 +163,7 @@
             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.Size = new System.Drawing.Size(36, 36);
             this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
             // 
             // bindingNavigatorMovePreviousItem
@@ -170,13 +172,13 @@
             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.Size = new System.Drawing.Size(36, 36);
             this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
             // 
             // bindingNavigatorSeparator
             // 
             this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
-            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39);
             // 
             // bindingNavigatorPositionItem
             // 
@@ -191,7 +193,7 @@
             // bindingNavigatorSeparator1
             // 
             this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
-            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39);
             // 
             // bindingNavigatorMoveNextItem
             // 
@@ -199,7 +201,7 @@
             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.Size = new System.Drawing.Size(36, 36);
             this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
             // 
             // bindingNavigatorMoveLastItem
@@ -208,39 +210,55 @@
             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.Size = new System.Drawing.Size(36, 36);
             this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
             // 
             // bindingNavigatorSeparator2
             // 
             this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
-            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 39);
             // 
             // 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.Size = new System.Drawing.Size(67, 36);
             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.전체삭제ToolStripMenuItem,
+            this.클립보드에서ToolStripMenuItem,
+            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.Size = new System.Drawing.Size(88, 36);
-            this.btImport.Text = "가져오기";
+            this.btImport.Text = "데이터";
+            // 
+            // 전체삭제ToolStripMenuItem
+            // 
+            this.전체삭제ToolStripMenuItem.Name = "전체삭제ToolStripMenuItem";
+            this.전체삭제ToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.전체삭제ToolStripMenuItem.Text = "전체 삭제";
+            this.전체삭제ToolStripMenuItem.Click += new System.EventHandler(this.전체삭제ToolStripMenuItem_Click);
             // 
             // 클립보드에서ToolStripMenuItem
             // 
             this.클립보드에서ToolStripMenuItem.Name = "클립보드에서ToolStripMenuItem";
-            this.클립보드에서ToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            this.클립보드에서ToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
-            this.클립보드에서ToolStripMenuItem.Text = "클립보드에서";
+            this.클립보드에서ToolStripMenuItem.Text = "클립보드에서 가져오기";
             this.클립보드에서ToolStripMenuItem.Click += new System.EventHandler(this.클립보드에서ToolStripMenuItem_Click);
             // 
+            // 클립보드에내보내기ToolStripMenuItem
+            // 
+            this.클립보드에내보내기ToolStripMenuItem.Name = "클립보드에내보내기ToolStripMenuItem";
+            this.클립보드에내보내기ToolStripMenuItem.Size = new System.Drawing.Size(198, 22);
+            this.클립보드에내보내기ToolStripMenuItem.Text = "클립보드에 내보내기";
+            this.클립보드에내보내기ToolStripMenuItem.Click += new System.EventHandler(this.클립보드에내보내기ToolStripMenuItem_Click);
+            // 
             // commonDataGridView
             // 
             this.commonDataGridView.AllowUserToAddRows = false;
@@ -251,22 +269,23 @@
             this.commonDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.commonDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.code,
-            this.svalueDataGridViewTextBoxColumn});
+            this.svalueDataGridViewTextBoxColumn,
+            this.svalue2});
             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.Size = new System.Drawing.Size(556, 587);
             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)))));
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.code.DefaultCellStyle = dataGridViewCellStyle2;
+            this.code.DefaultCellStyle = dataGridViewCellStyle6;
             this.code.HeaderText = "형태";
             this.code.Name = "code";
             this.code.ReadOnly = true;
@@ -278,6 +297,13 @@
             this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
             this.svalueDataGridViewTextBoxColumn.ReadOnly = true;
             // 
+            // svalue2
+            // 
+            this.svalue2.DataPropertyName = "svalue2";
+            this.svalue2.HeaderText = "프로세스";
+            this.svalue2.Name = "svalue2";
+            this.svalue2.ReadOnly = true;
+            // 
             // groupBox1
             // 
             this.groupBox1.Controls.Add(this.commonDataGridView);
@@ -321,7 +347,7 @@
             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.Location = new System.Drawing.Point(10, 660);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(556, 32);
             this.tbFind.TabIndex = 3;
@@ -331,6 +357,7 @@
             // groupBox2
             // 
             this.groupBox2.Controls.Add(this.treeView1);
+            this.groupBox2.Controls.Add(this.panel2);
             this.groupBox2.Controls.Add(this.btSelect);
             this.groupBox2.Controls.Add(this.label8);
             this.groupBox2.Controls.Add(this.panel1);
@@ -354,7 +381,7 @@
             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.Size = new System.Drawing.Size(433, 437);
             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);
@@ -364,7 +391,7 @@
             // 
             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.Location = new System.Drawing.Point(10, 511);
             this.btSelect.Name = "btSelect";
             this.btSelect.Size = new System.Drawing.Size(568, 54);
             this.btSelect.TabIndex = 5;
@@ -388,10 +415,10 @@
             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.Location = new System.Drawing.Point(10, 565);
             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.Size = new System.Drawing.Size(568, 166);
             this.panel1.TabIndex = 3;
             // 
             // button2
@@ -399,14 +426,16 @@
             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.Size = new System.Drawing.Size(46, 151);
-            this.button2.TabIndex = 3;
+            this.button2.TabIndex = 1;
             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.tbProcessI);
+            this.groupBox4.Controls.Add(this.label2);
             this.groupBox4.Controls.Add(this.tbItemA);
             this.groupBox4.Controls.Add(this.label5);
             this.groupBox4.Controls.Add(this.tbTypeA);
@@ -416,60 +445,80 @@
             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.Size = new System.Drawing.Size(261, 151);
             this.groupBox4.TabIndex = 2;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "신규 추가";
             // 
+            // tbProcessI
+            // 
+            this.tbProcessI.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.tbProcessI.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tbProcessI.Location = new System.Drawing.Point(74, 23);
+            this.tbProcessI.Name = "tbProcessI";
+            this.tbProcessI.Size = new System.Drawing.Size(170, 22);
+            this.tbProcessI.TabIndex = 1;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(16, 29);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.TabIndex = 0;
+            this.label2.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.Location = new System.Drawing.Point(74, 79);
             this.tbItemA.Name = "tbItemA";
             this.tbItemA.Size = new System.Drawing.Size(170, 22);
-            this.tbItemA.TabIndex = 12;
+            this.tbItemA.TabIndex = 5;
             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.Location = new System.Drawing.Point(40, 84);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(29, 12);
-            this.label5.TabIndex = 11;
+            this.label5.TabIndex = 4;
             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.Location = new System.Drawing.Point(74, 51);
             this.tbTypeA.Name = "tbTypeA";
             this.tbTypeA.Size = new System.Drawing.Size(170, 22);
-            this.tbTypeA.TabIndex = 10;
+            this.tbTypeA.TabIndex = 3;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(40, 58);
+            this.label6.Location = new System.Drawing.Point(40, 56);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(29, 12);
-            this.label6.TabIndex = 9;
+            this.label6.TabIndex = 2;
             this.label6.Text = "분류";
             // 
             // btAdd
             // 
             this.btAdd.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.btAdd.Location = new System.Drawing.Point(10, 108);
+            this.btAdd.Location = new System.Drawing.Point(10, 110);
             this.btAdd.Name = "btAdd";
             this.btAdd.Size = new System.Drawing.Size(241, 38);
-            this.btAdd.TabIndex = 2;
+            this.btAdd.TabIndex = 6;
             this.btAdd.Text = "추가";
             this.btAdd.UseVisualStyleBackColor = true;
             this.btAdd.Click += new System.EventHandler(this.button3_Click);
             // 
             // groupBox3
             // 
+            this.groupBox3.Controls.Add(this.tbProcessE);
+            this.groupBox3.Controls.Add(this.label1);
             this.groupBox3.Controls.Add(this.tbItemE);
             this.groupBox3.Controls.Add(this.label4);
             this.groupBox3.Controls.Add(this.tbTypeE);
@@ -479,57 +528,74 @@
             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.Size = new System.Drawing.Size(261, 151);
-            this.groupBox3.TabIndex = 2;
+            this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "선택자료 편집";
             // 
+            // 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, 23);
+            this.tbProcessE.Name = "tbProcessE";
+            this.tbProcessE.Size = new System.Drawing.Size(170, 22);
+            this.tbProcessE.TabIndex = 1;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(26, 29);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 0;
+            this.label1.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.Location = new System.Drawing.Point(84, 79);
             this.tbItemE.Name = "tbItemE";
             this.tbItemE.Size = new System.Drawing.Size(170, 22);
-            this.tbItemE.TabIndex = 6;
+            this.tbItemE.TabIndex = 5;
             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.Location = new System.Drawing.Point(50, 85);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(29, 12);
-            this.label4.TabIndex = 5;
+            this.label4.TabIndex = 4;
             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.Location = new System.Drawing.Point(84, 51);
             this.tbTypeE.Name = "tbTypeE";
             this.tbTypeE.Size = new System.Drawing.Size(170, 22);
-            this.tbTypeE.TabIndex = 4;
+            this.tbTypeE.TabIndex = 3;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(50, 58);
+            this.label3.Location = new System.Drawing.Point(50, 57);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(29, 12);
-            this.label3.TabIndex = 3;
+            this.label3.TabIndex = 2;
             this.label3.Text = "분류";
             // 
             // btEdit
             // 
             this.btEdit.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.btEdit.Location = new System.Drawing.Point(10, 108);
+            this.btEdit.Location = new System.Drawing.Point(10, 110);
             this.btEdit.Name = "btEdit";
             this.btEdit.Size = new System.Drawing.Size(241, 38);
-            this.btEdit.TabIndex = 2;
+            this.btEdit.TabIndex = 6;
             this.btEdit.Text = "편집";
             this.btEdit.UseVisualStyleBackColor = true;
-            this.btEdit.Click += new System.EventHandler(this.button2_Click);
+            this.btEdit.Click += new System.EventHandler(this.btEdit_Click);
             // 
             // btRefreshTreeview
             // 
@@ -542,6 +608,49 @@
             this.btRefreshTreeview.UseVisualStyleBackColor = true;
             this.btRefreshTreeview.Click += new System.EventHandler(this.button1_Click);
             // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
+            // tam
+            // 
+            this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.CommonTableAdapter = this.ta;
+            this.tam.UpdateOrder = FPJ0000.dsJobReportTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.button3);
+            this.panel2.Controls.Add(this.button1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel2.Location = new System.Drawing.Point(443, 74);
+            this.panel2.Name = "panel2";
+            this.panel2.Padding = new System.Windows.Forms.Padding(10);
+            this.panel2.Size = new System.Drawing.Size(135, 437);
+            this.panel2.TabIndex = 6;
+            // 
+            // button1
+            // 
+            this.button1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.button1.Location = new System.Drawing.Point(10, 10);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(115, 48);
+            this.button1.TabIndex = 0;
+            this.button1.Text = "전체 확장";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click_1);
+            // 
+            // button3
+            // 
+            this.button3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.button3.Location = new System.Drawing.Point(10, 58);
+            this.button3.Name = "button3";
+            this.button3.Size = new System.Drawing.Size(115, 48);
+            this.button3.TabIndex = 1;
+            this.button3.Text = "전체 축소";
+            this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.button3_Click_1);
+            // 
             // fJobProcessSelect
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -553,11 +662,11 @@
             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.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsJobReport)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.commonDataGridView)).EndInit();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
@@ -567,6 +676,7 @@
             this.groupBox4.PerformLayout();
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
+            this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -596,8 +706,6 @@
         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;
@@ -618,5 +726,17 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Label lbWarningUser;
         private System.Windows.Forms.Button btSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn svalue2;
+        private System.Windows.Forms.TextBox tbProcessE;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox tbProcessI;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ToolStripMenuItem 전체삭제ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 클립보드에내보내기ToolStripMenuItem;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button button3;
     }
 }

SubProject/FPJ0000/JobReport_/fJobProcessSelect.cs

@@ -32,6 +32,11 @@ namespace FPJ0000.JobReport_
             this.FullName = fullname;
             this.dsJobReport.Common.TableNewRow += Common_TableNewRow;
             this.FormClosing += FJobProcessManager_FormClosing;
+            this.KeyPreview = true;
+
+            this.KeyDown += (s1, e1) => {
+                if (e1.KeyCode == Keys.Escape) this.Close();
+            };
 
             // 이벤트 핸들러 연결
             treeView1.ItemDrag += TreeView1_ItemDrag;
@@ -47,8 +52,17 @@ namespace FPJ0000.JobReport_
             lbWarningManager.Visible = isAdmin;
             lbWarningUser.Visible = !isAdmin;
             btSelect.Visible = !isAdmin;
+
             if (fullname.isEmpty() == false)
+            {
                 this.Text = $"작업형태 선택(기존값:{fullname})";
+                var buf = fullname.Split('|');
+                var prc = buf[0].Trim();
+                this.tbProcessE.Text = prc;
+                this.tbProcessI.Text = prc;
+                this.tbProcessI.Enabled = false;
+                this.tbProcessE.Enabled = false;
+            }
         }
 
         private void TreeView1_ItemDrag(object sender, ItemDragEventArgs e)
@@ -78,6 +92,11 @@ namespace FPJ0000.JobReport_
 
         private void TreeView1_DragDrop(object sender, DragEventArgs e)
         {
+            if (this.bn.Enabled == false)
+            {
+                AR.UTIL.MsgE("권한이 없어 drag & drop 을 사용할 수 없습니다");
+                return;
+            }
             if (IsAdmin == false) return;
             // 드롭된 위치의 노드 찾기
             Point pt = treeView1.PointToClient(new Point(e.X, e.Y));
@@ -120,12 +139,16 @@ namespace FPJ0000.JobReport_
                     var cnd = destinationNode.Nodes[idx];
                     UpdateParentInfo(cnd, inseritem);
                 }
+                //AR.UTIL.MsgE("카테고리 이동은 불가 합니다");
 
             }
             else
             {     // 노드 이동
-
+                if (destinationNode.Level > 2)
-                if (destinationNode.Level > 1)
+                {
+                    UTIL.MsgE("최하위 레벨이하로는 이동할 수 없습니다");
+                }
+                else if (destinationNode.Level > 1)
                 {
                     var idx = destinationNode.Parent.Nodes.Add((TreeNode)draggedNode.Clone());
                     var cnd = destinationNode.Parent.Nodes[idx];
@@ -146,7 +169,7 @@ namespace FPJ0000.JobReport_
 
 
 
-            if (cnd.Level == 1)  //최하위
+            if (cnd.Level == 2)  //최하위
             {
                 var grp = cnd.Parent.Text;
                 var prc = cnd.Parent.Parent.Text;
@@ -155,7 +178,7 @@ namespace FPJ0000.JobReport_
                 if (newitem)
                 {
                     dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
-                    //ndr.svalue2 = prc;
+                    ndr.svalue2 = prc;
                     ndr.svalue = grp;
                     ndr.memo = cnd.Text;
                     ndr.wuid = FCOMMON.info.Login.no;
@@ -170,7 +193,7 @@ namespace FPJ0000.JobReport_
                     //기존정보를 업데이트한다
                     var dr = cnd.Tag as dsJobReport.CommonRow;
                     dr.svalue = grp;
-                   // dr.svalue2 = prc;
+                    dr.svalue2 = prc;
                     dr.EndEdit();
 
                 }
@@ -186,7 +209,7 @@ namespace FPJ0000.JobReport_
                     if (newitem)
                     {
                         dsJobReport.CommonRow ndr = this.dsJobReport.Common.NewCommonRow();
-                    //    ndr.svalue2 = prc;
+                        ndr.svalue2 = prc;
                         ndr.svalue = cnd.Text;
                         ndr.memo = nd.Text;
                         ndr.wuid = FCOMMON.info.Login.no;
@@ -199,7 +222,7 @@ namespace FPJ0000.JobReport_
                     else
                     {
                         var dr = nd.Tag as dsJobReport.CommonRow;
-                     //   dr.svalue2 = prc;
+                        dr.svalue2 = prc;
                         dr.EndEdit();
                     }
                 }
@@ -278,8 +301,19 @@ namespace FPJ0000.JobReport_
         {
             try
             {
-                this.ta.Fill(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode);
+                var fullname = this.FullName.Split('|');
+                var pc = fullname[0].ToString();
+                var grp = fullname.Length > 2 ? fullname[1].Trim() : string.Empty;
+                if (pc.isEmpty())
+                {
+                    this.ta.Fill(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode);
+                }   
+                else
+                    this.ta.FillByJobProcess(this.dsJobReport.Common, FCOMMON.info.Login.gcode, GroupCode, pc);
+
                 this.commonDataGridView.AutoResizeColumns();
+
+        
             }
             catch (System.Exception ex)
             {
@@ -296,6 +330,16 @@ namespace FPJ0000.JobReport_
             this.Show();
             System.Windows.Forms.Application.DoEvents();
             this.treeView1.Focus();
+
+            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
+            this.bn.Enabled = (curLevel >= 5);
+            this.button2.Enabled = bn.Enabled;
+            this.btAdd.Enabled = bn.Enabled;
+            this.btEdit.Enabled = bn.Enabled;
+            this.groupBox3.Enabled = bn.Enabled;
+            this.groupBox4.Enabled = bn.Enabled;
+            this.commonDataGridView.ReadOnly = !bn.Enabled;
+          
         }
         void RefreshTreeview()
         {
@@ -316,23 +360,24 @@ namespace FPJ0000.JobReport_
             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);
+            var grp_process = dsJobReport.Common.OrderBy(t => t.svalue2).GroupBy(t => t.svalue2);
             TreeNode autoSelectNode = null;
-            foreach (var grp in grp_process)
+            foreach (var prc in grp_process)
             {
-                var grpname = grp.Key;
+                var prcname = prc.Key;
-                if (grpname.isEmpty()) grpname = "N/A";
+                if (prcname.isEmpty()) prcname = "N/A";
-                if (grpname.Equals("(N/A)")) grpname = "N/A";
+                if (prcname.Equals("(N/A)")) prcname = "N/A";
 
-                var nd = treeView1.Nodes.Add(grpname, grpname); //add process node
+                var nd = treeView1.Nodes.Add(prcname, prcname); //add process node
-                //var grp_jobtype = prc.OrderBy(t => t.svalue).GroupBy(t => t.svalue);
+                var grp_jobtype = prc.OrderBy(t => t.svalue).GroupBy(t => t.svalue);
-                //foreach (var grp in grp_jobtype) //job type
+                foreach (var grp in grp_jobtype) //job type
                 {
-                    //var nd2 = nd.Nodes.Add(grp.Key, grp.Key);
+                    var nd2 = nd.Nodes.Add(grp.Key, grp.Key);
+                    var grpname = grp.Key;
                     foreach (var item in grp.OrderBy(t => t.memo))
                     {
-                        var nd3 = nd.Nodes.Add(item.memo, item.memo);     //job item
+                        var nd3 = nd2.Nodes.Add(item.memo, item.memo);     //job item
-                        if (grpname.Equals("N/A"))
+                        if (prcname.Equals("N/A"))
                             nd3.ForeColor = Color.DimGray;
                         else
                             nd3.ForeColor = Color.Black;
@@ -340,7 +385,7 @@ namespace FPJ0000.JobReport_
 
                         if (bAutoselect)
                         {
-                            if (grpname.Equals(SelGRP) && item.memo.Equals(SelITM))
+                            if (prcname.Equals(SelPRC) && grpname.Equals(SelGRP) && item.memo.Equals(SelITM))
                             {
                                 autoSelectNode = nd3;
                             }
@@ -348,14 +393,24 @@ namespace FPJ0000.JobReport_
                     }
                 }
             }
-            treeView1.ExpandAll(); //show all 
+            this.treeView1.CollapseAll();
             groupBox3.Enabled = false;
             if (autoSelectNode != null)
             {
                 this.treeView1.SelectedNode = autoSelectNode;
                 this.treeView1.SelectedNode.EnsureVisible();
+                this.treeView1.SelectedNode.Expand(); 
                 this.treeView1.Focus();
+
             }
+            else
+            {
+       
+                if(this.treeView1.Nodes.Count > 0)
+                    this.treeView1.Nodes[0].Expand();
+            }
+
+
 
 
         }
@@ -367,7 +422,7 @@ namespace FPJ0000.JobReport_
             {
                 try
                 {
-                    var cols = new string[] { "svalue2", "svalue", "memo" };
+                    var cols = new string[] { "svalue", "memo" };
                     var filterstring = "";
                     foreach (var col in cols)
                     {
@@ -406,18 +461,25 @@ namespace FPJ0000.JobReport_
             RefreshTreeview();
         }
 
-        private void button2_Click(object sender, EventArgs e)
+        private void btEdit_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;
             }
+            if (prc.isEmpty())
+            {
+                UTIL.MsgE("프로세스가 입력되지 않았습니다");
+                tbProcessE.Focus();
+                return;
+            }
 
             var nd = this.treeView1.SelectedNode;
             if (nd == null)
@@ -432,7 +494,7 @@ namespace FPJ0000.JobReport_
             }
 
             //동일데이터가있는지확인
-            var exist = this.dsJobReport.Common.Where(t => t.RowState != DataRowState.Deleted &&  t.svalue.Equals(grp) && t.memo.Equals(item)).Any();
+            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("동일한 항목이 존재합니다 / 확인 후 다시 진행 하세요");
@@ -443,7 +505,7 @@ namespace FPJ0000.JobReport_
             var dr = nd.Tag as dsJobReport.CommonRow;
             if (dr == null) return;
 
-            var changecate = dr.svalue2.Equals(prc) == false || dr.svalue.Equals(grp) == false;
+            var changecate = (dr.svalue2.Equals(prc) == false || dr.svalue.Equals(grp) == false);
 
             dr.svalue2 = prc;
             dr.svalue = grp;
@@ -452,7 +514,7 @@ namespace FPJ0000.JobReport_
 
             //카테고리가 변경되었다면 위치를 이동시켜야한다
             nd.Remove(); //선택노드를 삭제한다.
-            AddNode(prc, grp, item, dr);
+            AddNode(prc,grp, item, dr);
 
 
 
@@ -460,8 +522,11 @@ namespace FPJ0000.JobReport_
         void AddNode(string prc, string grp, string item, dsJobReport.CommonRow dr)
         {
             //프로세스 노드 선택
+            TreeNode tn_grp = null;
             TreeNode tn_prc = null;
+            if (grp.isEmpty()) grp = "N/A";
             if (prc.isEmpty()) prc = "N/A";
+
             var prc_nodes = this.treeView1.Nodes.Find(prc, false);
             if (prc_nodes.Any() == false)
             {
@@ -472,25 +537,25 @@ namespace FPJ0000.JobReport_
                 tn_prc = prc_nodes.First(); //첫번째 노드로 변경
             }
 
-            //분류노드확인
+
-            TreeNode tn_type = null;
+            var grp_nodes = tn_prc.Nodes.Find(grp, false);
-            var type_nodes = tn_prc.Nodes.Find(grp, false);
+            if (grp_nodes.Any() == false)
-            if (type_nodes.Any() == false)
             {
-                tn_type = tn_prc.Nodes.Add(grp, grp); //신규노드추가
+                tn_grp = tn_prc.Nodes.Add(grp, grp); //신규노드추가
             }
             else
             {
-                tn_type = type_nodes.First(); //첫번째 노드로 변경
+                tn_grp = grp_nodes.First(); //첫번째 노드로 변경
             }
 
 
+
             //아이템노드확인
             TreeNode tn_item = null;
-            var item_nodes = tn_type.Nodes.Find(item, false);
+            var item_nodes = tn_grp.Nodes.Find(item, false);
             if (item_nodes.Any() == false)
             {
-                tn_item = tn_type.Nodes.Add(item, item); //신규노드추가
+                tn_item = tn_grp.Nodes.Add(item, item); //신규노드추가
             }
             else
             {
@@ -500,14 +565,24 @@ namespace FPJ0000.JobReport_
 
             tn_item.Tag = dr;
             treeView1.SelectedNode = tn_item;
+            treeView1.SelectedNode.EnsureVisible();
         }
 
         private void button3_Click(object sender, EventArgs e)
         {
             //add
-            var prc = tbProcessA.Text.Trim();
             var grp = tbTypeA.Text.Trim();
             var item = tbItemA.Text.Trim();
+            var prc = tbProcessI.Text.Trim();
+
+            if (prc.isEmpty())
+            {
+                UTIL.MsgE("프로세스가 입력되지 않았습니다");
+                tbProcessI.Focus();
+                return;
+            }
+
+
             if (item.isEmpty())
             {
                 UTIL.MsgE("형태는 반드시 입력되어야 합니다");
@@ -576,13 +651,15 @@ namespace FPJ0000.JobReport_
 
             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;
 
+            tbItemE.Text = dr.memo;
+            tbItemA.Text = dr.memo;
+
+            tbProcessE.Text = dr.svalue2;
+            tbProcessI.Text = dr.svalue2;
+
             groupBox3.Enabled = true;
             groupBox3.Text = $"선택자료 편집({dr.idx})";
 
@@ -600,60 +677,11 @@ namespace FPJ0000.JobReport_
                 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)
             {
@@ -668,18 +696,21 @@ namespace FPJ0000.JobReport_
 
             //동일데이터가있는지확인
             var dr = nd.Tag as dsJobReport.CommonRow;
-            var prc = dr.svalue2;
             var grp = dr.svalue;
+            var prc = dr.svalue2;
             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();
+            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();
+            nd.Remove();
+            //RefreshTreeview();
         }
 
         private void btDelete_Click(object sender, EventArgs e)
@@ -716,10 +747,12 @@ namespace FPJ0000.JobReport_
 
         private void treeView1_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
         {
+            if (this.FullName.isEmpty()) return;
+
             //노드에서 항목 더블클릭
             var nd = this.treeView1.SelectedNode;
             if (nd == null) return;
-            if (nd.Level < 2) return;
+            if (nd.Level < 1) return;
             var dr = nd.Tag as dsJobReport.CommonRow;
             if (dr == null) return;
             Feedback(dr);
@@ -730,7 +763,7 @@ namespace FPJ0000.JobReport_
             //트리뷰항목 선택
             var nd = this.treeView1.SelectedNode;
             if (nd == null) return;
-            if (nd.Level < 2)
+            if (nd.Level < 1)
             {
                 UTIL.MsgE("최하위 항목을 선택하세요");
                 return;
@@ -743,6 +776,8 @@ namespace FPJ0000.JobReport_
         private void commonDataGridView_CellContentDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
             //데이터그리드뷰 항목 더블클릭
+            if (this.FullName.isEmpty()) return;
+
             var drv = bs.Current as DataRowView;
             if (drv == null) return;
             var dr = drv.Row as dsJobReport.CommonRow;
@@ -752,17 +787,108 @@ namespace FPJ0000.JobReport_
 
         void Feedback(dsJobReport.CommonRow dr)
         {
-
             var prc = dr.svalue2;
             var grp = dr.svalue;
             var itm = dr.memo;
-            if (prc.isEmpty()) prc = "N/A";
+            if (grp.isEmpty()) grp = "N/A";
             this.SelectedValue = $"{prc}|{grp}|{itm}";
             DialogResult = DialogResult.OK;
         }
 
         public string SelectedValue { get; set; } = "";
+        private void 클립보드에서ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if(this.haschanged())
+            {
+                AR.UTIL.MsgE("변경된 자료가 존재합니다.\n현재 자료를 저장하거나 화면을 다시 호출 하세요");
+                return;
+            }
 
+            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.svalue2.Equals(prc) && t.svalue.Equals(grp)).Any())
+                {
+                    scnt += 1;
+                    continue;
+                }
+
+                icnt += 1;
+
+                var dr = this.dsJobReport.Common.NewCommonRow();
+                dr.svalue = grp;
+                dr.svalue2 = prc;
+                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 전체삭제ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var dlg = UTIL.MsgQ("현재 목록 데이터를 삭제할까요?\n저장을 하면 최종 서버에 적용 됩니다");
+            if (dlg != DialogResult.Yes) return;
+            var cnt = 0;
+            while (bs.Count > 0)
+            {
+                bs.RemoveCurrent();
+                cnt += 1;
+            }
+            UTIL.MsgI($"{cnt}건의 자료가 삭제되었습니다\n저장버튼을 누르면 데이터베이스에 적용 됩니다");
+        }
+
+        private void 클립보드에내보내기ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var sb = new System.Text.StringBuilder();
+            sb.AppendLine("항목\t분류\t프로세스");
+            var filterdata = this.dsJobReport.Common.Select(this.bs.Filter, this.bs.Sort);
+            var cnt = 0;
+            foreach (dsJobReport.CommonRow dr in filterdata)
+            {
+                if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+                cnt += 1;
+                sb.AppendLine($"{dr.memo}\t{dr.svalue}\t{dr.svalue2}");
+            }
+            Clipboard.SetText(sb.ToString());
+            AR.UTIL.MsgI($"{cnt}건의 자료가 클립보드에 입력되었습니다\n엑셀등의 프로그램에서 Ctrl+V 하세요");
+        }
+
+        private void button1_Click_1(object sender, EventArgs e)
+        {
+            this.treeView1.ExpandAll();
+        }
+
+        private void button3_Click_1(object sender, EventArgs e)
+        {
+            this.treeView1.CollapseAll();
+        }
     }
 }

SubProject/FPJ0000/JobReport_/fJobProcessSelect.resx

@@ -117,26 +117,20 @@
   <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">
+  <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>341, 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">
+  <metadata name="dsJobReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>317, 17</value>
+    <value>17, 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
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -148,7 +142,7 @@
   <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
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/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
@@ -159,7 +153,7 @@
   <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
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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
@@ -168,7 +162,7 @@
   <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
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -177,7 +171,7 @@
   <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+//
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/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
@@ -188,7 +182,7 @@
   <data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        vAAADrwBlbxySQAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
@@ -207,10 +201,25 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <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="code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="svalue2.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>
+  <metadata name="svalue2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>202, 17</value>
+  </metadata>
+  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>266, 17</value>
+  </metadata>
 </root>

SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs

@@ -30,26 +30,27 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
-            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType2 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
-            FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType4 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            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();
@@ -124,6 +125,8 @@
             this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+            this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
@@ -225,6 +228,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -316,6 +320,7 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 25);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -469,9 +474,11 @@
             this.복사ToolStripMenuItem,
             this.qlToolStripMenuItem,
             this.편집ToolStripMenuItem,
-            this.삭제ToolStripMenuItem});
+            this.삭제ToolStripMenuItem,
+            this.toolStripMenuItem4,
+            this.상태일괄변경ToolStripMenuItem});
             this.cm.Name = "contextMenuStrip1";
-            this.cm.Size = new System.Drawing.Size(224, 310);
+            this.cm.Size = new System.Drawing.Size(249, 352);
             // 
             // columnSizeToolStripMenuItem
             // 
@@ -481,7 +488,7 @@
             this.saveToolStripMenuItem,
             this.loadToolStripMenuItem});
             this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem";
-            this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.columnSizeToolStripMenuItem.Text = "Column Size";
             // 
             // autoToolStripMenuItem
@@ -519,64 +526,64 @@
             // exportListToolStripMenuItem
             // 
             this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem";
-            this.exportListToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.exportListToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.exportListToolStripMenuItem.Text = "Export List";
             this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(220, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(245, 6);
             // 
             // refreshToolStripMenuItem
             // 
             this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
-            this.refreshToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.refreshToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.refreshToolStripMenuItem.Text = "Refresh";
             this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(220, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(245, 6);
             // 
             // partListToolStripMenuItem
             // 
             this.partListToolStripMenuItem.Name = "partListToolStripMenuItem";
-            this.partListToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.partListToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.partListToolStripMenuItem.Text = "PartList";
             this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(220, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(245, 6);
             // 
             // 복사ToolStripMenuItem
             // 
             this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
-            this.복사ToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.복사ToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.복사ToolStripMenuItem.Text = "복사";
             this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click);
             // 
             // qlToolStripMenuItem
             // 
             this.qlToolStripMenuItem.Name = "qlToolStripMenuItem";
-            this.qlToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.qlToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.qlToolStripMenuItem.Text = "복사(기간)";
             this.qlToolStripMenuItem.Click += new System.EventHandler(this.qlToolStripMenuItem_Click);
             // 
             // 편집ToolStripMenuItem
             // 
             this.편집ToolStripMenuItem.Name = "편집ToolStripMenuItem";
-            this.편집ToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.편집ToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.편집ToolStripMenuItem.Text = "편집";
             this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click);
             // 
             // 삭제ToolStripMenuItem
             // 
             this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
-            this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(223, 36);
+            this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
             this.삭제ToolStripMenuItem.Text = "삭제";
             this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
             // 
@@ -672,6 +679,7 @@
             // dtSD
             // 
             this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtSD.Name = "dtSD";
             this.dtSD.Size = new System.Drawing.Size(90, 37);
             this.dtSD.Text = "1982-11-23";
@@ -695,6 +703,7 @@
             // dtED
             // 
             this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.dtED.Name = "dtED";
             this.dtED.Size = new System.Drawing.Size(90, 37);
             this.dtED.Text = "1982-11-23";
@@ -730,6 +739,7 @@
             // tbProcess
             // 
             this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
+            this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbProcess.Name = "tbProcess";
             this.tbProcess.Size = new System.Drawing.Size(200, 37);
             // 
@@ -778,7 +788,7 @@
             // 태그자료만조회ToolStripMenuItem
             // 
             this.태그자료만조회ToolStripMenuItem.Name = "태그자료만조회ToolStripMenuItem";
-            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.태그자료만조회ToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
             this.태그자료만조회ToolStripMenuItem.Text = "태그자료만 조회";
             this.태그자료만조회ToolStripMenuItem.Click += new System.EventHandler(this.태그자료만조회ToolStripMenuItem_Click);
             // 
@@ -832,13 +842,25 @@
             this.splitContainer1.SplitterWidth = 10;
             this.splitContainer1.TabIndex = 6;
             // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(245, 6);
+            // 
+            // 상태일괄변경ToolStripMenuItem
+            // 
+            this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem";
+            this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(248, 36);
+            this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경";
+            this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click);
+            // 
             // 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.ColumnCount = 21;
             this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
             this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
             this.fpSpread1_Sheet1.ActiveRowIndex = -1;
@@ -880,131 +902,142 @@
             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(0, 20).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).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.ColumnHeader.Rows.Get(0).Height = 30F;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
             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).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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType17;
+            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).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).CellType = textCellType4;
             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).CellType = textCellType5;
             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).CellType = textCellType6;
             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).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 = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
             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).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 = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType10;
             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;
+            numberCellType1.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
+            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType1;
             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;
+            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType2;
             this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hrs";
             this.fpSpread1_Sheet1.Columns.Get(11).Width = 52F;
-            numberCellType7.MaximumValue = 999999999999999D;
+            numberCellType3.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
+            numberCellType3.MinimumValue = -999999999999999D;
-            numberCellType7.NullDisplay = "--";
+            numberCellType3.NullDisplay = "--";
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType7;
+            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType25;
+            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).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);
+            dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType3.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
+            dateTimeCellType1.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
-            dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType3.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0);
+            dateTimeCellType1.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).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)))));
-            dateTimeCellType4.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
+            dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
-            dateTimeCellType4.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
+            dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
-            dateTimeCellType4.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
+            dateTimeCellType2.DateTimeFormat = FarPoint.Win.Spread.CellType.DateTimeFormat.TimeOnly;
-            dateTimeCellType4.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
+            dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
-            dateTimeCellType4.TimeDefault = new System.DateTime(2025, 1, 2, 22, 53, 4, 0);
+            dateTimeCellType2.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).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 = textCellType26;
+            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).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).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).Tag = "kisullv";
             this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType8.DecimalPlaces = 2;
+            numberCellType4.DecimalPlaces = 2;
-            numberCellType8.NegativeRed = true;
+            numberCellType4.NegativeRed = true;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8;
+            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).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).CellType = textCellType14;
             this.fpSpread1_Sheet1.Columns.Get(19).DataField = "tag";
             this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType5.DecimalPlaces = 0;
+            numberCellType5.MaximumValue = 10000000D;
+            numberCellType5.MinimumValue = -10000000D;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(20).Tag = "idx";
             this.fpSpread1_Sheet1.DataAutoCellTypes = false;
             this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
             this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.Protect = false;
             this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange;
+            this.fpSpread1_Sheet1.ShowEditingRowSelector = true;
             this.fpSpread1_Sheet1.ShowRowSelector = true;
             this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
             // 
@@ -1115,6 +1148,8 @@
         private System.Windows.Forms.ToolStripMenuItem 개인별프로젝트스케쥴현황ToolStripMenuItem;
         private System.Windows.Forms.ToolStripButton toolStripButton5;
         private System.Windows.Forms.ToolStripMenuItem qlToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
+        private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem;
         private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport.cs

@@ -1,4 +1,5 @@
-using System;
+using FCOMMON;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -155,13 +156,18 @@ namespace FPJ0000
                 btSave.Visible = false;
                 //btViewDel.Visible = false;
                 fpSpread1.EditMode = false;
-                fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row;
+                //fpSpread1.Sheets[0].SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row;
+                
                 fpSpread1.EditModePermanent = false;
                 fpSpread1.EditModeReplace = false;
 
                 foreach (FarPoint.Win.Spread.Column col in fpSpread1.ActiveSheet.Columns)
                     col.Locked = true;
             }
+            //fpSpread1.SelectionBlockOptions = FarPoint.Win.Spread.SelectionBlockOptions.Cells;
+            fpSpread1.ActiveSheet.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Cell;
+            fpSpread1.ActiveSheet.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange;
+            fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.Normal;
 
 
 
@@ -346,30 +352,32 @@ namespace FPJ0000
                         this.fpSpread1.ActiveSheet.Rows[i].BackColor = SystemColors.Window;
                         break;
                 }
-                if(statusStr.EndsWith("완료"))
+                if (statusStr.EndsWith("완료"))
                 {
-                    this.fpSpread1.ActiveSheet.Cells[i,stsindex].BackColor = Color.Lime;
+                    this.fpSpread1.ActiveSheet.Cells[i, stsindex].BackColor = Color.Lime;
                 }
                 else
                 {
-                    this.fpSpread1.ActiveSheet.Cells[i, stsindex].BackColor = Color.Tomato;
+                    this.fpSpread1.ActiveSheet.Cells[i, stsindex].BackColor = Color.Gold;
                 }
             }
             this.fpSpread1.ResumeLayout();
         }
-        void funcSave()
+        int funcSave()
         {
+            int cnt = 0;
             this.Validate();
             this.bs.EndEdit();
             try
             {
-                this.tam.UpdateAll(this.dsMSSQL);
+                cnt = this.tam.UpdateAll(this.dsMSSQL);
                 FormattingData();
             }
             catch (Exception ex)
             {
                 FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
             }
+            return cnt;
         }
 
         private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
@@ -586,9 +594,10 @@ namespace FPJ0000
             //newdr.description = "";
             newdr.pdate = DateTime.Now.ToShortDateString(); //190509
             newdr.idx = -1;
-            newdr.hrs = 8.0;
+            //newdr.hrs = 8.0;
+            newdr.SethrsNull();
             newdr.ot = 0.0;
-
+            newdr.status = string.Empty;
             newdr.Setot2Null();
             newdr.SetotwuidNull();
             newdr.SetotReasonNull();
@@ -895,12 +904,12 @@ namespace FPJ0000
                 newdr.wdate = DateTime.Now;
                 newdr.wuid = FCOMMON.info.Login.no;
                 newdr.uid = FCOMMON.info.Login.no;
-                
+
                 newdr.pdate = d.ToShortDateString(); //190509
                 newdr.idx = -1;
                 newdr.hrs = 8.0;
                 newdr.ot = 0.0;
-                
+
                 newdr.Setot2Null();
                 newdr.SetotwuidNull();
                 newdr.SetotReasonNull();
@@ -914,10 +923,65 @@ namespace FPJ0000
                 ucnt += ta.Update(dsMSSQL.JobReport);
                 d = d.AddDays(1);
             }
-                        
+
             util.MsgI($"토/일은 제외되었습니다. 기타 휴일은 적용되지 않았으니 데이터를 확인하세요\nupdate count : {ucnt}");
 
-         
+
+        }
+
+        private void 상태일괄변경ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            //상태일괄변경
+
+            var selected = this.fpSpread1_Sheet1.GetSelections();   //선택된 개체확인
+            List<int> rows = new List<int>();
+            foreach (var item in selected)
+            {
+                for (int i = item.Row; i < item.Row + item.RowCount; i++)
+                {
+                    if (rows.Contains(i) == false)
+                    {
+                        if (fpSpread1_Sheet1.IsRowBound(i))
+                        {
+                            rows.Add(i);
+                        }
+                    }
+
+                }
+            }
+
+            //이대상의 실제 데이터베이스 인덱스값을 생성해서 폼에 전송한다.
+            var codlist = DBM.getCodeList("12");
+
+            var f = new FCOMMON.fLOV(codlist.Select(t => t.Value).ToArray());
+            if (f.ShowDialog() != DialogResult.OK) return;
+
+            if (f.SelectedValue.isEmpty()) return;
+
+            var colstat = fpSpread1_Sheet1.Columns["status"];
+            var colidx = fpSpread1_Sheet1.Columns["idx"];
+            var value = f.SelectedValue;
+
+            foreach (var rowindex in rows)
+            {
+                var idx = fpSpread1_Sheet1.Cells[rowindex, colidx.Index].Value;
+                var dr = this.dsMSSQL.JobReport.Where(t => t.idx == (int)idx).FirstOrDefault();
+                dr["status"] = value;
+                dr.EndEdit();
+
+            }
+            this.Validate();
+            this.bs.EndEdit();
+            if (btSave.Visible == false)
+            {
+                var cnt = funcSave();
+                AR.UTIL.MsgI($"{cnt}건의 자료가 업데이트 되었습니다");
+            }
+            else
+            {
+                FCOMMON.Util.MsgI($"{rows.Count} 건의 자료가 변경되었습니다\n저장 버튼을 누르면 적용 됩니다\n취소하려면 새로고침을 누르세요");
+            }
+
         }
     }
 }

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
-        vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        vQAADr0BR/uQrQAAASpJREFUOE9jGDygcNbz/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
-        vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        vQAADr0BR/uQrQAAALZJREFUOE9jGDogvP3BfyiTdBDf/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
-        vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        vQAADr0BR/uQrQAAAKNJREFUOE9jGHygcNbz/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
-        vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        vQAADr0BR/uQrQAAASxJREFUOE9jGFygcNbz/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
-        vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        vQAADr0BR/uQrQAAAUpJREFUOE9jGLzg7gL2/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
-        vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        vQAADr0BR/uQrQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -240,52 +240,23 @@
         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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3qv6EsF70UohSzKioF6WpTQ3s
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALwSURBVDhPhZLrS1NhHMf3Kv+EsF70UojSyqioF6XpmhrY
-        Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpzduc0y1npM7lZc674GWpu5yjO2d+e87ZUgOhH3x4Xjzn
+        zVTMvM0pmtrQhUG2mEbmJTRRoUKUohcV2kWntnnZ5tyGM1LnNe838LLUXc7Rnc1vzzlbaiD0gw/Pi+d8
-        ++H8vucIuAl8qIy7UqxRhJVofgdJNRQ5aZ5S7tTSYcV9dMgztf68RFV+LPz9AT60d4Kf9KiWLfSqXm9g
+        P5zf9xweO8GPVPFXi/WK8BL9b75UT5GT5ihlTwMdXqyjQ59rTRckmvKjER8OcKG9E/K0S7NsoVdNpkGn
-        zbZNmK27rFo4aPxatCDvyyyiSkbtwnT5QXfUNaGF6mW9fpTtm3ZAO8NAO8tAM81APbUF5cQmWgw2bDJA
+        2bYJs3WXVQsLjeFFC/K+ziK6ZMQuyJB7eaLuCSvULptMw07dtAOGGQaGWQb6aQbaqS2ofm2iZciGTQZo
-        4yiFvE8zSHyhp/6RBElbqA37FgbmWPyYY8jJoJ+XbKHbuIlvBjsRODGwyEK74ECBfBb+Dzre8eHIUj/T
+        HKGQ93kGSS9N1D8SvrSF2rBvoXfOiR9zDDkZ9HCSLajHN/F9yE4ELvQuOmFYcKBAPovAh+3vuXBUacDk
-        LWn4trjqBhIrb6KytQ759aXwl3rBjyAsOIdA2WmUNZbxq1hpBktrdgTGdjO8IKLY/2PHcBOaxl+jUpPD
+        bWnEtqjqJpIqb6GytQ759aUIlPoigCAoOI9g2RmUNZZxq1hpBktrdgTHqRlOEFkc+Kl9oAlNY29Qqc/h
-        S2IrQpDzNgYZdVEQVV9FQnUCGgeX0KS34uvQBtZJT0GyHpoXCMuFB32kmaxmrAtvhmUoUqbzkriqUBK+
+        JHEVoch5F4vMumgIq68hsToRjX1LaDJZ8a1/A+ukJ76si+YEgnKB1wlpllM/2om3AzIUqTI4SXxVGAlf
-        hpSXyVAZbfwq7eMUFKSHNZsDQfm9LgE3wYXddFZNPHRGNaq19/G0LRuRpZcQVxEO3bQdOlIsV7Bq0tWJ
+        R+qrFGjGbdwqbWMUFKSHNZsD/Pxut4CdkEI1La5JgHFci2rDAzxTZiOq9DLiKyJgnLbDSIplC9ZMuDsx
-        mQgCZXsEFx5JHWdyjyKmXIiByT4UdKVCJs9C1PMA1Ck/4+c8Ax0ptm/KgV7CssUB/8duwUmJh9hXcgQZ
+        E0GwbI/g4mOp42zuEcSWC9A7oUNBZxpkcjGiXwShTvUFP+cZGEmxuikHugnLFgcCn3gEpyTeIn/JYWTW
-        tdG4XRWM6LLLvCRLHgNJfTJ5kwBw9wOzLPq5T0ywkCK9M9Uuga/k0Lyv5DB5yAO+OR64XhSAtFfxUBkU
+        xuBOVQhiyq5wErE8FpL6FPImQWDve2ed6GE/McFCivTL0roF/pKD8/6SQ+Qhb/jneONGURDSXydAM6RA
-        KFDkIvVDPERVEdARgZb8GxoioB1OIlDurnAxs4deXKcxOM/ydI8t4F5NCpJIUFwdhezauzt3HPYtlgga
+        gSIXaR8TIKyKhJEIDOTf0BMB7XARgWp3hUtZXfTiOo2+eSeHenQB92tSkUyCoupoZNfe27ljsW85iaBh
-        dgWcbc68K/gfNm6F5D2Cs1md9nbt8PZ+D++HYWzCeSK20eqOkyJT2kwzG3ZL5/cRp2mFgmmZgtHNitXB
+        V8Da5sy7gv9hY1dI2SM4J+6wK/X92/s9vB+DI2Ou43GNVk+cFJmqnJzZsFs6DCbX5AqFyWUK4x5WrA4O
-        wzVvpVkMGcadFEWte95pHnHHBYJTKa1p3qKWNh+xwuwtbqB3SHLh9RdRA+0pal47ntDc7hUvTxQIBII/
+        tnkrTQSDoy6KotZ97jYPeuI83unU1nQ/YYvypEhh9hM10Dsku/H9i7CB9hE2rx1LbG7zTZAn8Xg83h/G
-        1jafUMnXM7oAAAAASUVORK5CYII=
+        xZ9C6y96BwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -352,6 +323,32 @@
         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">
@@ -405,7 +402,7 @@
   <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>563, 17</value>
   </metadata>
-  <data name="dateTimeCellType3.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
@@ -415,7 +412,7 @@
         AAD/////AQgAAP////8AAQgAAAs=
 </value>
   </data>
-  <data name="dateTimeCellType4.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
+  <data name="dateTimeCellType2.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
         cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1

SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs

@@ -109,7 +109,7 @@
             // hrsLabel
             // 
             hrsLabel.AutoSize = true;
-            hrsLabel.Location = new System.Drawing.Point(24, 163);
+            hrsLabel.Location = new System.Drawing.Point(19, 163);
             hrsLabel.Name = "hrsLabel";
             hrsLabel.Size = new System.Drawing.Size(53, 12);
             hrsLabel.TabIndex = 19;
@@ -119,7 +119,7 @@
             // 
             typeLabel.AutoSize = true;
             typeLabel.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            typeLabel.Location = new System.Drawing.Point(3, 75);
+            typeLabel.Location = new System.Drawing.Point(267, 75);
             typeLabel.Name = "typeLabel";
             typeLabel.Size = new System.Drawing.Size(69, 20);
             typeLabel.TabIndex = 11;
@@ -192,11 +192,11 @@
             // 
             label6.AutoSize = true;
             label6.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            label6.Location = new System.Drawing.Point(655, 75);
+            label6.Location = new System.Drawing.Point(3, 74);
             label6.Name = "label6";
-            label6.Size = new System.Drawing.Size(39, 20);
+            label6.Size = new System.Drawing.Size(69, 20);
             label6.TabIndex = 13;
-            label6.Text = "공정";
+            label6.Text = "프로세스";
             // 
             // label2
             // 
@@ -383,22 +383,23 @@
             // tbWW
             // 
             this.tbWW.Font = new System.Drawing.Font("맑은 고딕", 12F);
-            this.tbWW.Location = new System.Drawing.Point(328, 6);
+            this.tbWW.Location = new System.Drawing.Point(342, 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(148, 29);
+            this.tbWW.Size = new System.Drawing.Size(134, 29);
             this.tbWW.TabIndex = 2;
             this.tbWW.TabStop = false;
             this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // tbJobProcess
             // 
+            this.tbJobProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.tbJobProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.tbJobProcess.FormattingEnabled = true;
-            this.tbJobProcess.Location = new System.Drawing.Point(700, 71);
+            this.tbJobProcess.Location = new System.Drawing.Point(78, 70);
             this.tbJobProcess.Name = "tbJobProcess";
-            this.tbJobProcess.Size = new System.Drawing.Size(166, 29);
+            this.tbJobProcess.Size = new System.Drawing.Size(183, 29);
             this.tbJobProcess.TabIndex = 14;
             // 
             // cmbState
@@ -418,9 +419,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(328, 38);
+            this.cmbPackage.Location = new System.Drawing.Point(342, 38);
             this.cmbPackage.Name = "cmbPackage";
-            this.cmbPackage.Size = new System.Drawing.Size(318, 29);
+            this.cmbPackage.Size = new System.Drawing.Size(304, 29);
             this.cmbPackage.TabIndex = 10;
             // 
             // cmbRequest
@@ -428,7 +429,7 @@
             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(77, 38);
+            this.cmbRequest.Location = new System.Drawing.Point(78, 38);
             this.cmbRequest.Name = "cmbRequest";
             this.cmbRequest.Size = new System.Drawing.Size(183, 29);
             this.cmbRequest.TabIndex = 8;
@@ -545,9 +546,9 @@
             // cmbTypeFull
             // 
             this.cmbTypeFull.Font = new System.Drawing.Font("맑은 고딕", 11.25F);
-            this.cmbTypeFull.Location = new System.Drawing.Point(77, 71);
+            this.cmbTypeFull.Location = new System.Drawing.Point(342, 71);
             this.cmbTypeFull.Name = "cmbTypeFull";
-            this.cmbTypeFull.Size = new System.Drawing.Size(569, 29);
+            this.cmbTypeFull.Size = new System.Drawing.Size(524, 29);
             this.cmbTypeFull.TabIndex = 31;
             this.cmbTypeFull.UseVisualStyleBackColor = true;
             this.cmbTypeFull.Click += new System.EventHandler(this.cmbType_Click);

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -1,4 +1,5 @@
 using AR;
+using arCtl;
 using FCOMMON;
 using System;
 using System.Collections.Generic;
@@ -41,7 +42,8 @@ namespace FPJ0000.JobReport_
             this.tbProject.SelectedIndexChanged += tbProject_SelectedIndexChanged;
             this.grpkisul.Visible = getKisulInput;
 
-            var bDev = System.Diagnostics.Debugger.IsAttached || FCOMMON.info.Login.level >= 9;
+            //개발자상태에서만 표시한다
+            var bDev = System.Diagnostics.Debugger.IsAttached ;
             tbJobType.Visible = bDev;
             tbJobGrp.Visible = bDev;
         }
@@ -117,18 +119,18 @@ namespace FPJ0000.JobReport_
             //this.cmbType.DataSource = dt_type;
 
             //공정
-            var dt_jobprocess = FCOMMON.DBM.getCodeTable("25", "code,memo,svalue");
+            var dt_jobprocess = FCOMMON.DBM.getCodeTable("16", "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");
+            //var dt_process = FCOMMON.DBM.getCodeTable("16", "code,memo,svalue");
-            this.tbJobProcess.DisplayMember = "Value";
+            //this.tbJobProcess.DisplayMember = "Value";
-            this.tbJobProcess.ValueMember = "Value";
+            //this.tbJobProcess.ValueMember = "Value";
-            this.tbJobProcess.DataSource = dt_process;
+            //this.tbJobProcess.DataSource = dt_process;
 
             if (getKisulInput)
             {
@@ -193,18 +195,18 @@ namespace FPJ0000.JobReport_
 
             RefreshJobTypeFull();
 
-            if (dr.process.isEmpty() && tbJobProcess.SelectedIndex < 0)	//기본값을 찾는다
+            //if (dr.process.isEmpty() && tbJobProcess.SelectedIndex < 0)	//기본값을 찾는다
-            {
+            //{
-                var dts = dt_process.AsEnumerable().Where(t => t.IsNull("SValue") == false).ToList();
+            //    var dts = dt_process.AsEnumerable().Where(t => t.IsNull("SValue") == false).ToList();
-                foreach (var dr in dts)
+            //    foreach (var dr in dts)
-                {
+            //    {
-                    if (dr["Svalue"].ToString().Equals("O"))
+            //        if (dr["Svalue"].ToString().Equals("O"))
-                    {
+            //        {
-                        tbJobProcess.Text = dr["Value"].ToString();
+            //            tbJobProcess.Text = dr["Value"].ToString();
-                        break;
+            //            break;
-                    }
+            //        }
-                }
+            //    }
-            }
+            //}
 
 
             if (dr.ot > 0)
@@ -393,11 +395,16 @@ namespace FPJ0000.JobReport_
             var jgrp = tbJobGrp.Text.Trim();
             var jtype = tbJobType.Text.Trim();
 
-            var fullname = $"{jtype} ← {jgrp} ← {jprc}";
+            var fullname = $"{jtype} ← {jgrp}";
 
-            if (jtype.isEmpty()) cmbTypeFull.Text = "업무형태를 선택하세요";
+            if (jtype.isEmpty())
+            {
+                cmbTypeFull.Text = "업무형태를 선택하세요";
+            }
             else cmbTypeFull.Text = fullname;
 
+
+
             cmbTypeFull.BackColor = jtype.isEmpty() ? Color.HotPink : Color.White;
         }
         //    editform.editor ed;
@@ -547,6 +554,12 @@ namespace FPJ0000.JobReport_
                 }
             }
 
+            if (cmbState.Text.isEmpty())
+            {
+                AR.UTIL.MsgE("상태를 선택하세요");
+                cmbState.Focus();
+                return;
+            }
             if (tbJobType.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("업무형태를 선택하세요");
@@ -555,7 +568,7 @@ namespace FPJ0000.JobReport_
             }
             if (tbJobProcess.Text.Trim() == "")
             {
-                FCOMMON.Util.MsgE("업무분류를 선택하세요");
+                FCOMMON.Util.MsgE("업무프로세스를 선택하세요");
                 tbJobProcess.Focus();
                 return;
             }
@@ -799,8 +812,14 @@ namespace FPJ0000.JobReport_
 
         void chkform_indexchan(object sender, EventArgs e)
         {
-            if (tbJobType.Text.isEmpty() == false && String.IsNullOrEmpty(cmbState.Text.Trim()) == false)
+            if (tbJobType.Text.isEmpty() == false)
             {
+                if (cmbState.Text.isEmpty())
+                {
+                    UTIL.MsgE("상태가 선택되어 있지 않습니다. 문서서식을 적용하려면 상태를 선택해야 합니다");
+                    cmbState.Focus();
+                    return;
+                }
 
                 //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
                 var formname = tbJobType.Text.Trim() + "|" + cmbState.Text.Trim();
@@ -1003,11 +1022,13 @@ namespace FPJ0000.JobReport_
                     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";
+                    if (grp.isEmpty() || grp.Equals("(N/A)")) grp = "N/A";
                     this.tbJobType.Text = itm;
                     this.tbJobGrp.Text = grp;
                     this.tbJobProcess.Text = prc;
                     RefreshJobTypeFull();
+
+                    chkform_indexchan(null, null);
                 }
         }
     }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.Designer.cs

@@ -39,20 +39,21 @@
             System.Windows.Forms.Label label3;
             System.Windows.Forms.Label label6;
             System.Windows.Forms.Label label2;
+            System.Windows.Forms.Label label7;
             this.tbHrs = new System.Windows.Forms.TextBox();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsPRJ = new FPJ0000.dsPRJ();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
             this.lbIndex = new System.Windows.Forms.ToolStripStatusLabel();
-            this.cmbType = new System.Windows.Forms.ComboBox();
+            this.cmbjobtype = new System.Windows.Forms.ComboBox();
             this.btSave = new System.Windows.Forms.Button();
             this.dts = new System.Windows.Forms.DateTimePicker();
             this.cmbUser = new System.Windows.Forms.ComboBox();
             this.tbProjectIndex = new System.Windows.Forms.TextBox();
             this.tbOt = new System.Windows.Forms.TextBox();
             this.tbWW = new System.Windows.Forms.TextBox();
-            this.cmbProcess = new System.Windows.Forms.ComboBox();
+            this.cmbjobproc = 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();
@@ -61,13 +62,14 @@
             this.tbProject = new System.Windows.Forms.ComboBox();
             this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.dte = new System.Windows.Forms.DateTimePicker();
             this.tbWeekE = new System.Windows.Forms.TextBox();
             this.chkEnable = new System.Windows.Forms.CheckBox();
             this.radAuto = new System.Windows.Forms.RadioButton();
             this.radLogin = new System.Windows.Forms.RadioButton();
             this.tbTag = new System.Windows.Forms.TextBox();
-            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.cmbjobgrp = new System.Windows.Forms.ComboBox();
             hrsLabel = new System.Windows.Forms.Label();
             typeLabel = new System.Windows.Forms.Label();
             label1 = new System.Windows.Forms.Label();
@@ -78,6 +80,7 @@
             label3 = new System.Windows.Forms.Label();
             label6 = new System.Windows.Forms.Label();
             label2 = new System.Windows.Forms.Label();
+            label7 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
             this.statusStrip1.SuspendLayout();
@@ -87,7 +90,7 @@
             // hrsLabel
             // 
             hrsLabel.AutoSize = true;
-            hrsLabel.Location = new System.Drawing.Point(16, 155);
+            hrsLabel.Location = new System.Drawing.Point(16, 189);
             hrsLabel.Name = "hrsLabel";
             hrsLabel.Size = new System.Drawing.Size(53, 12);
             hrsLabel.TabIndex = 16;
@@ -163,16 +166,16 @@
             // label6
             // 
             label6.AutoSize = true;
-            label6.Location = new System.Drawing.Point(319, 124);
+            label6.Location = new System.Drawing.Point(319, 148);
             label6.Name = "label6";
             label6.Size = new System.Drawing.Size(53, 12);
             label6.TabIndex = 13;
-            label6.Text = "업무분류";
+            label6.Text = "프로세스";
             // 
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new System.Drawing.Point(177, 155);
+            label2.Location = new System.Drawing.Point(177, 189);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(53, 12);
             label2.TabIndex = 16;
@@ -182,7 +185,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("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.tbHrs.Location = new System.Drawing.Point(73, 145);
+            this.tbHrs.Location = new System.Drawing.Point(73, 179);
             this.tbHrs.Name = "tbHrs";
             this.tbHrs.Size = new System.Drawing.Size(77, 33);
             this.tbHrs.TabIndex = 17;
@@ -221,15 +224,15 @@
             this.lbIndex.Size = new System.Drawing.Size(17, 17);
             this.lbIndex.Text = "--";
             // 
-            // cmbType
+            // cmbjobtype
             // 
-            this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbjobtype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbType.FormattingEnabled = true;
+            this.cmbjobtype.FormattingEnabled = true;
-            this.cmbType.Location = new System.Drawing.Point(73, 116);
+            this.cmbjobtype.Location = new System.Drawing.Point(73, 116);
-            this.cmbType.Name = "cmbType";
+            this.cmbjobtype.Name = "cmbjobtype";
-            this.cmbType.Size = new System.Drawing.Size(240, 20);
+            this.cmbjobtype.Size = new System.Drawing.Size(626, 20);
-            this.cmbType.TabIndex = 14;
+            this.cmbjobtype.TabIndex = 14;
-            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
+            this.cmbjobtype.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
             // 
             // btSave
             // 
@@ -281,7 +284,7 @@
             this.tbOt.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ot", true));
             this.tbOt.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.tbOt.ForeColor = System.Drawing.Color.Red;
-            this.tbOt.Location = new System.Drawing.Point(236, 145);
+            this.tbOt.Location = new System.Drawing.Point(236, 179);
             this.tbOt.Name = "tbOt";
             this.tbOt.Size = new System.Drawing.Size(77, 33);
             this.tbOt.TabIndex = 17;
@@ -299,14 +302,14 @@
             this.tbWW.TabStop = false;
             this.tbWW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // cmbProcess
+            // cmbjobproc
             // 
-            this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbjobproc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbProcess.FormattingEnabled = true;
+            this.cmbjobproc.FormattingEnabled = true;
-            this.cmbProcess.Location = new System.Drawing.Point(378, 120);
+            this.cmbjobproc.Location = new System.Drawing.Point(378, 144);
-            this.cmbProcess.Name = "cmbProcess";
+            this.cmbjobproc.Name = "cmbjobproc";
-            this.cmbProcess.Size = new System.Drawing.Size(321, 20);
+            this.cmbjobproc.Size = new System.Drawing.Size(321, 20);
-            this.cmbProcess.TabIndex = 15;
+            this.cmbjobproc.TabIndex = 15;
             // 
             // cmbState
             // 
@@ -346,7 +349,10 @@
             this.tam.EETGW_JobReport_AutoInputTableAdapter = null;
             this.tam.EETGW_JobReport_EBoardTableAdapter = null;
             this.tam.EETGW_NoteTableAdapter = null;
+            this.tam.EETGW_Project_LayoutTableAdapter = null;
             this.tam.EETGW_ProjecthistoryDTableAdapter = null;
+            this.tam.EETGW_ProjectResonTableAdapter = null;
+            this.tam.EETGW_ProjectsScheduleTableAdapter = null;
             this.tam.EETGW_ProjectToDoTableAdapter = null;
             this.tam.EETGW_SaveCostTableAdapter = null;
             this.tam.JobReportTableAdapter = this.ta;
@@ -358,6 +364,7 @@
             this.tam.ProjectsTableAdapter = null;
             this.tam.SPMasterTableAdapter = null;
             this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            this.tam.vEETGW_Project_LayoutListTableAdapter = null;
             // 
             // tbProject
             // 
@@ -381,19 +388,22 @@
             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, 186);
+            this.richTextBoxEx1.Location = new System.Drawing.Point(0, 224);
+            this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.richTextBoxEx1.Name = "richTextBoxEx1";
             this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
-    "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+    "*\\generator Riched20 10.0.22621}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
     "Ex1\\par\r\n}\r\n";
             this.richTextBoxEx1.SetColorWithFont = true;
             this.richTextBoxEx1.ShowToolStrip = true;
-            this.richTextBoxEx1.Size = new System.Drawing.Size(850, 452);
+            this.richTextBoxEx1.Size = new System.Drawing.Size(850, 414);
             this.richTextBoxEx1.TabIndex = 58;
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+            this.panel1.Controls.Add(label7);
+            this.panel1.Controls.Add(this.cmbjobgrp);
             this.panel1.Controls.Add(this.checkBox1);
             this.panel1.Controls.Add(this.dte);
             this.panel1.Controls.Add(this.tbWeekE);
@@ -405,7 +415,7 @@
             this.panel1.Controls.Add(this.tbProject);
             this.panel1.Controls.Add(label2);
             this.panel1.Controls.Add(hrsLabel);
-            this.panel1.Controls.Add(this.cmbType);
+            this.panel1.Controls.Add(this.cmbjobtype);
             this.panel1.Controls.Add(label5);
             this.panel1.Controls.Add(typeLabel);
             this.panel1.Controls.Add(label6);
@@ -417,7 +427,7 @@
             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.cmbjobproc);
             this.panel1.Controls.Add(this.tbProjectIndex);
             this.panel1.Controls.Add(this.tbWW);
             this.panel1.Controls.Add(projectLabel);
@@ -426,10 +436,21 @@
             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(850, 186);
+            this.panel1.Size = new System.Drawing.Size(850, 224);
             this.panel1.TabIndex = 59;
             this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
             // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(8, 39);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(60, 16);
+            this.checkBox1.TabIndex = 61;
+            this.checkBox1.Text = "종료일";
+            this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+            // 
             // dte
             // 
             this.dte.Location = new System.Drawing.Point(72, 37);
@@ -453,7 +474,7 @@
             // chkEnable
             // 
             this.chkEnable.AutoSize = true;
-            this.chkEnable.Location = new System.Drawing.Point(444, 153);
+            this.chkEnable.Location = new System.Drawing.Point(444, 187);
             this.chkEnable.Name = "chkEnable";
             this.chkEnable.Size = new System.Drawing.Size(48, 16);
             this.chkEnable.TabIndex = 57;
@@ -463,7 +484,7 @@
             // radAuto
             // 
             this.radAuto.AutoSize = true;
-            this.radAuto.Location = new System.Drawing.Point(624, 153);
+            this.radAuto.Location = new System.Drawing.Point(624, 187);
             this.radAuto.Name = "radAuto";
             this.radAuto.Size = new System.Drawing.Size(75, 16);
             this.radAuto.TabIndex = 56;
@@ -475,7 +496,7 @@
             // 
             this.radLogin.AutoSize = true;
             this.radLogin.Checked = true;
-            this.radLogin.Location = new System.Drawing.Point(507, 153);
+            this.radLogin.Location = new System.Drawing.Point(507, 187);
             this.radLogin.Name = "radLogin";
             this.radLogin.Size = new System.Drawing.Size(99, 16);
             this.radLogin.TabIndex = 56;
@@ -492,16 +513,23 @@
             this.tbTag.TabIndex = 60;
             this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // checkBox1
+            // label7
             // 
-            this.checkBox1.AutoSize = true;
+            label7.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(8, 39);
+            label7.Location = new System.Drawing.Point(40, 149);
-            this.checkBox1.Name = "checkBox1";
+            label7.Name = "label7";
-            this.checkBox1.Size = new System.Drawing.Size(60, 16);
+            label7.Size = new System.Drawing.Size(29, 12);
-            this.checkBox1.TabIndex = 61;
+            label7.TabIndex = 62;
-            this.checkBox1.Text = "종료일";
+            label7.Text = "분류";
-            this.checkBox1.UseVisualStyleBackColor = true;
+            // 
-            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+            // cmbjobgrp
+            // 
+            this.cmbjobgrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbjobgrp.FormattingEnabled = true;
+            this.cmbjobgrp.Location = new System.Drawing.Point(72, 145);
+            this.cmbjobgrp.Name = "cmbjobgrp";
+            this.cmbjobgrp.Size = new System.Drawing.Size(241, 20);
+            this.cmbjobgrp.TabIndex = 63;
             // 
             // fJobReport_AddAI
             // 
@@ -515,7 +543,6 @@
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "fJobReport_AddAI";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "업무일지 자동 입력 양식";
             this.Load += new System.EventHandler(this.fJobReport_Add_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
@@ -539,14 +566,14 @@
         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.ComboBox cmbjobtype;
         private System.Windows.Forms.Button btSave;
         private System.Windows.Forms.DateTimePicker dts;
         private System.Windows.Forms.ComboBox cmbUser;
         private System.Windows.Forms.TextBox tbProjectIndex;
         private System.Windows.Forms.TextBox tbOt;
         private System.Windows.Forms.TextBox tbWW;
-        private System.Windows.Forms.ComboBox cmbProcess;
+        private System.Windows.Forms.ComboBox cmbjobproc;
         private System.Windows.Forms.ComboBox cmbState;
         private System.Windows.Forms.ComboBox cmbPackage;
         private System.Windows.Forms.ComboBox cmbRequest;
@@ -560,5 +587,6 @@
         private System.Windows.Forms.DateTimePicker dte;
         private System.Windows.Forms.TextBox tbWeekE;
         private System.Windows.Forms.CheckBox checkBox1;
+        private System.Windows.Forms.ComboBox cmbjobgrp;
     }
 }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.cs

@@ -93,15 +93,15 @@ namespace FPJ0000.JobReport_
 
             //타입
             var dt_type = FCOMMON.DBM.getCodeTable("15");
-            this.cmbType.DisplayMember = "Value";
+            this.cmbjobtype.DisplayMember = "Value";
-            this.cmbType.ValueMember = "Value";
+            this.cmbjobtype.ValueMember = "Value";
-            this.cmbType.DataSource = dt_type;
+            this.cmbjobtype.DataSource = dt_type;
 
             //공정
             var dt_process = FCOMMON.DBM.getCodeTable("16");
-            this.cmbProcess.DisplayMember = "Value";
+            this.cmbjobproc.DisplayMember = "Value";
-            this.cmbProcess.ValueMember = "Value";
+            this.cmbjobproc.ValueMember = "Value";
-            this.cmbProcess.DataSource = dt_process;
+            this.cmbjobproc.DataSource = dt_process;
 
             if (dr.autoinput == "L") radLogin.Checked = true;
             else radAuto.Checked = true;
@@ -130,8 +130,10 @@ namespace FPJ0000.JobReport_
             tbProject.Text = dr.projectName;
             cmbRequest.SelectedValue = dr.requestpart;
             cmbPackage.SelectedValue = dr.package;
-            cmbType.SelectedValue = dr.type;
+            cmbjobtype.SelectedValue = dr.type;
-            cmbProcess.SelectedValue = dr.process;
+            cmbjobproc.SelectedValue = dr.process;
+            cmbjobgrp.SelectedValue = dr.jobgrp;
+       
             tbTag.Text = dr.tag;
 
             //if (cmbRequest.Text == "") cmbRequest.Text = "EE1";
@@ -253,10 +255,10 @@ namespace FPJ0000.JobReport_
                                             this.cmbPackage.Text = predr["package"].ToString(); //190506
 
                                         if (predr["type"] != DBNull.Value)
-                                            this.cmbType.Text = predr["type"].ToString(); //190506
+                                            this.cmbjobtype.Text = predr["type"].ToString(); //190506
 
                                         if (predr["process"] != DBNull.Value)
-                                            cmbProcess.Text = predr["process"].ToString(); //190506
+                                            cmbjobproc.Text = predr["process"].ToString(); //190506
                                     }
                                 }
                             }
@@ -298,7 +300,7 @@ namespace FPJ0000.JobReport_
                 tbProject.Focus();
                 return;
             }
-            if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
+            if (cmbjobtype.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
             {
                 FCOMMON.Util.MsgE("진행 내용이 없습니다.");
                 this.richTextBoxEx1.Focus();
@@ -313,16 +315,16 @@ namespace FPJ0000.JobReport_
                 return;
             }
 
-            if (cmbType.Text.Trim() == "")
+            if (cmbjobtype.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("업무형태를 선택하세요");
-                cmbType.Focus();
+                cmbjobtype.Focus();
                 return;
             }
-            if (cmbProcess.Text.Trim() == "")
+            if (cmbjobproc.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("공정을 선택하세요");
-                cmbProcess.Focus();
+                cmbjobproc.Focus();
                 return;
             }
             if (cmbUser.SelectedIndex < 0)
@@ -372,8 +374,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 = cmbjobtype.Text;
-            this.dr.process = cmbProcess.Text;
+            this.dr.process = cmbjobproc.Text;
+            this.dr.jobgrp = cmbjobgrp.Text;
             this.dr.tag = tbTag.Text.Trim();
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;
@@ -412,20 +415,20 @@ namespace FPJ0000.JobReport_
 
         private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (cmbType.Text.Trim() != "" &&
+            if (cmbjobtype.Text.Trim() != "" &&
-                cmbType.SelectedIndex >= 0 &&
+                cmbjobtype.SelectedIndex >= 0 &&
-                cmbProcess.SelectedIndex < 0 &&
+                cmbjobproc.SelectedIndex < 0 &&
                 cmbUser.SelectedValue != null)
             {
                 //공정을 자동선택해준다.
                 //마지막 데이터를 찾아서 공정등의 정보를 업데이트한다.
                 var uid = cmbUser.SelectedValue.ToString();
-                var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbType.Text.Trim());
+                var lastDt = FCOMMON.DBM.getLastJobReportData(uid, cmbjobtype.Text.Trim());
                 if (lastDt != null && lastDt.Rows.Count > 0)
                 {
                     var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
                     if (predr["process"] != DBNull.Value)
-                        cmbProcess.Text = predr["process"].ToString(); //190506
+                        cmbjobproc.Text = predr["process"].ToString(); //190506
                 }
             }
         }

SubProject/FPJ0000/JobReport_/fJobReport_AddAI.resx

@@ -150,9 +150,6 @@
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>100, 17</value>
   </metadata>
-  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>100, 17</value>
-  </metadata>
   <metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -168,4 +165,7 @@
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>226, 17</value>
   </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

SubProject/FPJ0000/dsJobReport.Designer.cs

@@ -1256,6 +1256,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnwdate;
             
+            private global::System.Data.DataColumn columnsvalue2;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public CommonDataTable() {
@@ -1369,6 +1371,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 svalue2Column {
+                get {
+                    return this.columnsvalue2;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1406,7 +1416,7 @@ namespace FPJ0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public CommonRow AddCommonRow(string gcode, string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate) {
+            public CommonRow AddCommonRow(string gcode, string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate, string svalue2) {
                 CommonRow rowCommonRow = ((CommonRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -1418,7 +1428,8 @@ namespace FPJ0000 {
                         fvalue,
                         memo,
                         wuid,
-                        wdate};
+                        wdate,
+                        svalue2};
                 rowCommonRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowCommonRow);
                 return rowCommonRow;
@@ -1458,6 +1469,7 @@ namespace FPJ0000 {
                 this.columnmemo = base.Columns["memo"];
                 this.columnwuid = base.Columns["wuid"];
                 this.columnwdate = base.Columns["wdate"];
+                this.columnsvalue2 = base.Columns["svalue2"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1483,6 +1495,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnwuid);
                 this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnwdate);
+                this.columnsvalue2 = new global::System.Data.DataColumn("svalue2", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnsvalue2);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -1500,6 +1514,7 @@ namespace FPJ0000 {
                 this.columnwuid.AllowDBNull = false;
                 this.columnwuid.MaxLength = 20;
                 this.columnwdate.AllowDBNull = false;
+                this.columnsvalue2.MaxLength = 1000;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2459,6 +2474,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string svalue2 {
+                get {
+                    if (this.Issvalue2Null()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableCommon.svalue2Column]));
+                    }
+                }
+                set {
+                    this[this.tableCommon.svalue2Column] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsgrpNull() {
@@ -2530,6 +2561,18 @@ namespace FPJ0000 {
             public void SetmemoNull() {
                 this[this.tableCommon.memoColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool Issvalue2Null() {
+                return this.IsNull(this.tableCommon.svalue2Column);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void Setsvalue2Null() {
+                this[this.tableCommon.svalue2Column] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -3361,10 +3404,11 @@ ORDER BY name, pdate";
             tableMapping.ColumnMappings.Add("memo", "memo");
             tableMapping.ColumnMappings.Add("wuid", "wuid");
             tableMapping.ColumnMappings.Add("wdate", "wdate");
+            tableMapping.ColumnMappings.Add("svalue2", "svalue2");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] 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))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] 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) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             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, "", "", ""));
             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, "", "", ""));
@@ -3382,10 +3426,12 @@ ORDER BY name, pdate";
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.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.DeleteCommand.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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_svalue2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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 [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate], [svalue2]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate, @svalue2);
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code";
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 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, "", "", ""));
@@ -3396,10 +3442,11 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.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.InsertCommand.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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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 [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));
+            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, [svalue2] = @svalue2 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) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)));
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code";
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 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, "", "", ""));
@@ -3410,6 +3457,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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, 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("@svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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, 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("@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("@IsNull_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -3426,6 +3474,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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_svalue2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_svalue2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "svalue2", 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, "", "", ""));
         }
         
@@ -3439,14 +3489,24 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Comm" +
+            this._commandCollection[0].CommandText = "SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2" +
-                "on WITH (nolock) WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY code";
+                "\r\nFROM     Common WITH (nolock)\r\nWHERE  (gcode = @gcode) AND (grp = @grp)\r\nORDER" +
+                " 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, "", "", ""));
+            this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[1].Connection = this.Connection;
+            this._commandCollection[1].CommandText = "SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2" +
+                "\r\nFROM     Common WITH (nolock)\r\nWHERE  (gcode = @gcode) AND (grp = @grp) AND (I" +
+                "SNULL(svalue2, \'\') = @jobtype)\r\nORDER BY code";
+            this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobtype", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3497,6 +3557,66 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
             return dataTable;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
+        public virtual int FillByJobProcess(dsJobReport.CommonDataTable dataTable, string gcode, string grp, string jobtype) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((grp == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(grp));
+            }
+            if ((jobtype == null)) {
+                throw new global::System.ArgumentNullException("jobtype");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(jobtype));
+            }
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual dsJobReport.CommonDataTable GetByJobProcess(string gcode, string grp, string jobtype) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
+            if ((gcode == null)) {
+                throw new global::System.ArgumentNullException("gcode");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+            }
+            if ((grp == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(grp));
+            }
+            if ((jobtype == null)) {
+                throw new global::System.ArgumentNullException("jobtype");
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((string)(jobtype));
+            }
+            dsJobReport.CommonDataTable dataTable = new dsJobReport.CommonDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
@@ -3530,7 +3650,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(int Original_idx, string Original_gcode, string Original_grp, string Original_code, string Original_svalue, global::System.Nullable<int> Original_ivalue, global::System.Nullable<double> Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) {
+        public virtual int Delete(int Original_idx, string Original_gcode, string Original_grp, string Original_code, string Original_svalue, global::System.Nullable<int> Original_ivalue, global::System.Nullable<double> Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_svalue2) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
@@ -3593,6 +3713,14 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_wuid));
             }
             this.Adapter.DeleteCommand.Parameters[15].Value = ((System.DateTime)(Original_wdate));
+            if ((Original_svalue2 == null)) {
+                this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[17].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[16].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[17].Value = ((string)(Original_svalue2));
+            }
             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)) {
@@ -3613,7 +3741,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string gcode, string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate) {
+        public virtual int Insert(string gcode, string grp, string code, string svalue, global::System.Nullable<int> ivalue, global::System.Nullable<double> fvalue, string memo, string wuid, System.DateTime wdate, string svalue2) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
@@ -3663,6 +3791,12 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 this.Adapter.InsertCommand.Parameters[7].Value = ((string)(wuid));
             }
             this.Adapter.InsertCommand.Parameters[8].Value = ((System.DateTime)(wdate));
+            if ((svalue2 == null)) {
+                this.Adapter.InsertCommand.Parameters[9].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[9].Value = ((string)(svalue2));
+            }
             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)) {
@@ -3693,6 +3827,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                     string memo, 
                     string wuid, 
                     System.DateTime wdate, 
+                    string svalue2, 
                     int Original_idx, 
                     string Original_gcode, 
                     string Original_grp, 
@@ -3703,6 +3838,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                     string Original_memo, 
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
+                    string Original_svalue2, 
                     int idx) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
@@ -3753,69 +3889,83 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(wuid));
             }
             this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(wdate));
-            this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx));
+            if ((svalue2 == null)) {
+                this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(svalue2));
+            }
+            this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode));
             }
             if ((Original_grp == null)) {
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_grp));
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_grp));
             }
             if ((Original_code == null)) {
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_code));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_code));
             }
             if ((Original_svalue == null)) {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_svalue));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_svalue));
             }
             if ((Original_ivalue.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_ivalue.Value));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_ivalue.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
             }
             if ((Original_fvalue.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[20].Value = ((double)(Original_fvalue.Value));
+                this.Adapter.UpdateCommand.Parameters[21].Value = ((double)(Original_fvalue.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
             }
             if ((Original_memo == null)) {
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_memo));
+                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_memo));
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[24].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_wdate));
-            this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(idx));
+            if ((Original_svalue2 == null)) {
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_svalue2));
+            }
+            this.Adapter.UpdateCommand.Parameters[28].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)) {
@@ -3846,6 +3996,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                     string memo, 
                     string wuid, 
                     System.DateTime wdate, 
+                    string svalue2, 
                     int Original_idx, 
                     string Original_gcode, 
                     string Original_grp, 
@@ -3855,8 +4006,9 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                     global::System.Nullable<double> Original_fvalue, 
                     string Original_memo, 
                     string Original_wuid, 
-                    System.DateTime Original_wdate) {
+                    System.DateTime Original_wdate, 
-            return this.Update(gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, Original_idx, Original_gcode, Original_grp, Original_code, Original_svalue, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_idx);
+                    string Original_svalue2) {
+            return this.Update(gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2, Original_idx, Original_gcode, Original_grp, Original_code, Original_svalue, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_svalue2, Original_idx);
         }
     }
     

SubProject/FPJ0000/dsJobReport.xsd

@@ -113,7 +113,7 @@ ORDER BY name, pdate</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Common" 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 [Common] 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))</CommandText>
+                    <CommandText>DELETE FROM [Common] 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) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)))</CommandText>
                     <Parameters>
                       <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="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -131,13 +131,15 @@ ORDER BY name, pdate</CommandText>
                       <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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_svalue2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <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);
+                    <CommandText>INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate], [svalue2]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate, @svalue2);
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code</CommandText>
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 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" />
@@ -148,12 +150,16 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" 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="" 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="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <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>
+                    <CommandText>SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
+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" />
@@ -162,8 +168,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 </SelectCommand>
                 <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));
+                    <CommandText>UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [svalue2] = @svalue2 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) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)));
-SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code</CommandText>
+SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 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" />
@@ -174,6 +180,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" 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="" 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="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <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="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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -190,6 +197,8 @@ 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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_svalue2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <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>
@@ -207,8 +216,25 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
               <Mapping SourceColumn="memo" DataSetColumn="memo" />
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
+              <Mapping SourceColumn="svalue2" DataSetColumn="svalue2" />
             </Mappings>
-            <Sources />
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Common" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByJobProcess" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByJobProcess" GeneratorSourceName="FillByJobProcess" GetMethodModifier="Public" GetMethodName="GetByJobProcess" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByJobProcess" UserSourceName="FillByJobProcess">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
+FROM     Common WITH (nolock)
+WHERE  (gcode = @gcode) AND (grp = @grp) AND (ISNULL(svalue2, '') = @jobtype)
+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" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="jobtype" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@jobtype" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
           </TableAdapter>
         </Tables>
         <Sources />
@@ -418,6 +444,13 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
                 </xs:simpleType>
               </xs:element>
               <xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
+              <xs:element name="svalue2" msprop:Generator_ColumnPropNameInTable="svalue2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue2" msprop:Generator_UserColumnName="svalue2" msprop:Generator_ColumnVarNameInTable="columnsvalue2" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/dsJobReport.xss

@@ -4,11 +4,11 @@
      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="3" 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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable: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" />
+    <Shape ID="DesignTable:Common" ZOrder="1" X="266" Y="226" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/dsPRJ.Designer.cs

@@ -9211,6 +9211,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnedate;
             
+            private global::System.Data.DataColumn columnjobgrp;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public EETGW_JobReport_AutoInputDataTable() {
@@ -9444,6 +9446,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)]
@@ -9505,7 +9515,8 @@ namespace FPJ0000 {
                         bool enable, 
                         string username, 
                         string ww, 
-                        string edate) {
+                        string edate, 
+                        string jobgrp) {
                 EETGW_JobReport_AutoInputRow rowEETGW_JobReport_AutoInputRow = ((EETGW_JobReport_AutoInputRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -9532,7 +9543,8 @@ namespace FPJ0000 {
                         enable,
                         username,
                         ww,
-                        edate};
+                        edate,
+                        jobgrp};
                 rowEETGW_JobReport_AutoInputRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEETGW_JobReport_AutoInputRow);
                 return rowEETGW_JobReport_AutoInputRow;
@@ -9587,6 +9599,7 @@ namespace FPJ0000 {
                 this.columnusername = base.Columns["username"];
                 this.columnww = base.Columns["ww"];
                 this.columnedate = base.Columns["edate"];
+                this.columnjobgrp = base.Columns["jobgrp"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -9642,6 +9655,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnww);
                 this.columnedate = new global::System.Data.DataColumn("edate", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnedate);
+                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.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -9673,6 +9688,7 @@ namespace FPJ0000 {
                 this.columnww.ReadOnly = true;
                 this.columnww.MaxLength = 6;
                 this.columnedate.MaxLength = 10;
+                this.columnjobgrp.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -21611,6 +21627,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.tableEETGW_JobReport_AutoInput.jobgrpColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_JobReport_AutoInput.jobgrpColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IspdateNull() {
@@ -21862,6 +21894,18 @@ namespace FPJ0000 {
             public void SetedateNull() {
                 this[this.tableEETGW_JobReport_AutoInput.edateColumn] = 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.tableEETGW_JobReport_AutoInput.jobgrpColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetjobgrpNull() {
+                this[this.tableEETGW_JobReport_AutoInput.jobgrpColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -36729,6 +36773,7 @@ ORDER BY pdate DESC";
             tableMapping.ColumnMappings.Add("username", "username");
             tableMapping.ColumnMappings.Add("ww", "ww");
             tableMapping.ColumnMappings.Add("edate", "edate");
+            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;
@@ -36751,7 +36796,8 @@ ORDER BY pdate DESC";
                 "@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoi" +
                 "nput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_e" +
                 "nable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_eda" +
-                "te)))";
+                "te)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_job" +
+                "grp)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             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, "", "", ""));
             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, "", "", ""));
@@ -36791,10 +36837,12 @@ ORDER BY pdate DESC";
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", 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 [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate], [jobgrp]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate, @jobgrp);
-SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())";
+SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())";
             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("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -36818,6 +36866,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "autoinput", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", 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 [EETGW_JobReport_AutoInput] SET [gcode] = @gcode, [pdate] = @pdate, [pidx]" +
@@ -36826,29 +36875,30 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                 "ss, [description] = @description, [remark] = @remark, [hrs] = @hrs, [ot] = @ot, " +
                 "[import] = @import, [wuid] = @wuid, [wdate] = @wdate, [description2] = @descript" +
                 "ion2, [tag] = @tag, [autoinput] = @autoinput, [enable] = @enable, [edate] = @eda" +
-                "te WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_" +
+                "te, [jobgrp] = @jobgrp WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_g" +
-                "pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pid" +
+                "code) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate" +
-                "x = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectNam" +
+                ")) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND " +
-                "e = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) AND" +
+                "((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Origin" +
-                " ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_" +
+                "al_projectName)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_" +
-                "requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart] = @Original_request" +
+                "uid)) AND ((@IsNull_requestpart = 1 AND [requestpart] IS NULL) OR ([requestpart]" +
-                "part)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR ([package] = @Origina" +
+                " = @Original_requestpart)) AND ((@IsNull_package = 1 AND [package] IS NULL) OR (" +
-                "l_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Origi" +
+                "[package] = @Original_package)) AND ((@IsNull_status = 1 AND [status] IS NULL) O" +
-                "nal_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_t" +
+                "R ([status] = @Original_status)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR (" +
-                "ype)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original" +
+                "[type] = @Original_type)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([" +
-                "_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR ([remark] = @Origin" +
+                "process] = @Original_process)) AND ((@IsNull_remark = 1 AND [remark] IS NULL) OR" +
-                "al_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hrs] = @Original_hrs))" +
+                " ([remark] = @Original_remark)) AND ((@IsNull_hrs = 1 AND [hrs] IS NULL) OR ([hr" +
-                " AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_" +
+                "s] = @Original_hrs)) AND ((@IsNull_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original" +
-                "import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] =" +
+                "_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_im" +
-                " @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag]" +
+                "port)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNu" +
-                " IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput" +
+                "ll_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinpu" +
-                "] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND " +
+                "t = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@Is" +
-                "[enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND " +
+                "Null_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@I" +
-                "[edate] IS NULL) OR ([edate] = @Original_edate)));\r\nSELECT idx, gcode, pdate, pi" +
+                "sNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNu" +
-                "dx, projectName, uid, requestpart, package, status, type, process, description, " +
+                "ll_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)));\r\nSELECT " +
-                "remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo." +
+                "idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, p" +
-                "getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate FROM EETGW_Job" +
+                "rocess, description, remark, hrs, ot, import, wuid, wdate, description2, tag, au" +
-                "Report_AutoInput WHERE (idx = @idx)";
+                "toinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww," +
+                " edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = @idx)";
             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("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -36872,6 +36922,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@autoinput", global::System.Data.SqlDbType.Char, 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("@enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, 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, 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("@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("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -36910,6 +36961,8 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_enable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "enable", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", 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, "", "", ""));
         }
         
@@ -36927,7 +36980,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = @"SELECT  idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, 
-               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate
+               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp
 FROM     EETGW_JobReport_AutoInput
 WHERE  (gcode = @gcode)";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
@@ -37024,7 +37077,8 @@ WHERE  (gcode = @gcode)";
                     string Original_tag, 
                     string Original_autoinput, 
                     global::System.Nullable<bool> Original_enable, 
-                    string Original_edate) {
+                    string Original_edate, 
+                    string Original_jobgrp) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
@@ -37175,6 +37229,14 @@ WHERE  (gcode = @gcode)";
                 this.Adapter.DeleteCommand.Parameters[36].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[37].Value = ((string)(Original_edate));
             }
+            if ((Original_jobgrp == null)) {
+                this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[39].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[38].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[39].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)) {
@@ -37217,7 +37279,8 @@ WHERE  (gcode = @gcode)";
                     string tag, 
                     string autoinput, 
                     global::System.Nullable<bool> enable, 
-                    string edate) {
+                    string edate, 
+                    string jobgrp) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
             }
@@ -37345,6 +37408,12 @@ WHERE  (gcode = @gcode)";
             else {
                 this.Adapter.InsertCommand.Parameters[21].Value = ((string)(edate));
             }
+            if ((jobgrp == null)) {
+                this.Adapter.InsertCommand.Parameters[22].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[22].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)) {
@@ -37388,6 +37457,7 @@ WHERE  (gcode = @gcode)";
                     string autoinput, 
                     global::System.Nullable<bool> enable, 
                     string edate, 
+                    string jobgrp, 
                     int Original_idx, 
                     string Original_gcode, 
                     string Original_pdate, 
@@ -37409,6 +37479,7 @@ WHERE  (gcode = @gcode)";
                     string Original_autoinput, 
                     global::System.Nullable<bool> Original_enable, 
                     string Original_edate, 
+                    string Original_jobgrp, 
                     int idx) {
             if ((gcode == null)) {
                 throw new global::System.ArgumentNullException("gcode");
@@ -37537,157 +37608,171 @@ WHERE  (gcode = @gcode)";
             else {
                 this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(edate));
             }
-            this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx));
+            if ((jobgrp == null)) {
+                this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(jobgrp));
+            }
+            this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_gcode));
             }
             if ((Original_pdate == null)) {
-                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[26].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_pdate));
+                this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_pdate));
             }
             if ((Original_pidx.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_pidx.Value));
+                this.Adapter.UpdateCommand.Parameters[28].Value = ((int)(Original_pidx.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[27].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[28].Value = global::System.DBNull.Value;
             }
             if ((Original_projectName == null)) {
-                this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[29].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_projectName));
+                this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_projectName));
             }
             if ((Original_uid == null)) {
-                this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_uid));
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_uid));
             }
             if ((Original_requestpart == null)) {
-                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_requestpart));
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_requestpart));
             }
             if ((Original_package == null)) {
-                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_package));
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_package));
             }
             if ((Original_status == null)) {
-                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_status));
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_status));
             }
             if ((Original_type == null)) {
-                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_type));
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_type));
             }
             if ((Original_process == null)) {
-                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_process));
+                this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_process));
             }
             if ((Original_remark == null)) {
-                this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_remark));
+                this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_remark));
             }
             if ((Original_hrs.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[45].Value = ((double)(Original_hrs.Value));
+                this.Adapter.UpdateCommand.Parameters[46].Value = ((double)(Original_hrs.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value;
             }
             if ((Original_ot.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[47].Value = ((double)(Original_ot.Value));
+                this.Adapter.UpdateCommand.Parameters[48].Value = ((double)(Original_ot.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value;
             }
             if ((Original_import.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[49].Value = ((bool)(Original_import.Value));
+                this.Adapter.UpdateCommand.Parameters[50].Value = ((bool)(Original_import.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value;
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[51].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[52].Value = ((System.DateTime)(Original_wdate));
             if ((Original_tag == null)) {
-                this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[53].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[52].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[53].Value = ((string)(Original_tag));
+                this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_tag));
             }
             if ((Original_autoinput == null)) {
-                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[55].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[54].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[55].Value = ((string)(Original_autoinput));
+                this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_autoinput));
             }
             if ((Original_enable.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[57].Value = ((bool)(Original_enable.Value));
+                this.Adapter.UpdateCommand.Parameters[58].Value = ((bool)(Original_enable.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[56].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[57].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value;
             }
             if ((Original_edate == null)) {
-                this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[58].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[59].Value = ((string)(Original_edate));
+                this.Adapter.UpdateCommand.Parameters[60].Value = ((string)(Original_edate));
             }
-            this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(idx));
+            if ((Original_jobgrp == null)) {
+                this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[62].Value = ((string)(Original_jobgrp));
+            }
+            this.Adapter.UpdateCommand.Parameters[63].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)) {
@@ -37731,6 +37816,7 @@ WHERE  (gcode = @gcode)";
                     string autoinput, 
                     global::System.Nullable<bool> enable, 
                     string edate, 
+                    string jobgrp, 
                     int Original_idx, 
                     string Original_gcode, 
                     string Original_pdate, 
@@ -37751,8 +37837,9 @@ WHERE  (gcode = @gcode)";
                     string Original_tag, 
                     string Original_autoinput, 
                     global::System.Nullable<bool> Original_enable, 
-                    string Original_edate) {
+                    string Original_edate, 
-            return this.Update(gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, edate, Original_idx, Original_gcode, Original_pdate, Original_pidx, Original_projectName, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_process, Original_remark, Original_hrs, Original_ot, Original_import, Original_wuid, Original_wdate, Original_tag, Original_autoinput, Original_enable, Original_edate, Original_idx);
+                    string Original_jobgrp) {
+            return this.Update(gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, edate, jobgrp, Original_idx, Original_gcode, Original_pdate, Original_pidx, Original_projectName, Original_uid, Original_requestpart, Original_package, Original_status, Original_type, Original_process, Original_remark, Original_hrs, Original_ot, Original_import, Original_wuid, Original_wdate, Original_tag, Original_autoinput, Original_enable, Original_edate, Original_jobgrp, Original_idx);
         }
     }
     

SubProject/FPJ0000/dsPRJ.xsd

@@ -2205,7 +2205,7 @@ WHERE  (gcode = @gcode) AND (wuid = @wuid) AND (import = 1) AND (CONVERT(CHAR(10
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_JobReport_AutoInput" 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 [EETGW_JobReport_AutoInput] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) 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_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) 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_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_JobReport_AutoInput] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) 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_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) 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_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)))</CommandText>
                     <Parameters>
                       <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="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -2245,13 +2245,15 @@ WHERE  (gcode = @gcode) AND (wuid = @wuid) AND (import = 1) AND (CONVERT(CHAR(10
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" 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 [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate);
+                    <CommandText>INSERT INTO [EETGW_JobReport_AutoInput] ([gcode], [pdate], [pidx], [projectName], [uid], [requestpart], [package], [status], [type], [process], [description], [remark], [hrs], [ot], [import], [wuid], [wdate], [description2], [tag], [autoinput], [enable], [edate], [jobgrp]) VALUES (@gcode, @pdate, @pidx, @projectName, @uid, @requestpart, @package, @status, @type, @process, @description, @remark, @hrs, @ot, @import, @wuid, @wdate, @description2, @tag, @autoinput, @enable, @edate, @jobgrp);
-SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())</CommandText>
+SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = SCOPE_IDENTITY())</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="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2275,13 +2277,14 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiStringFixedLength" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Char" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" 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="false">
                     <CommandText>SELECT  idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, 
-               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate
+               dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp
 FROM     EETGW_JobReport_AutoInput
 WHERE  (gcode = @gcode)</CommandText>
                     <Parameters>
@@ -2291,8 +2294,8 @@ WHERE  (gcode = @gcode)</CommandText>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_JobReport_AutoInput] SET [gcode] = @gcode, [pdate] = @pdate, [pidx] = @pidx, [projectName] = @projectName, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [process] = @process, [description] = @description, [remark] = @remark, [hrs] = @hrs, [ot] = @ot, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [description2] = @description2, [tag] = @tag, [autoinput] = @autoinput, [enable] = @enable, [edate] = @edate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) 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_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) 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_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)));
+                    <CommandText>UPDATE [EETGW_JobReport_AutoInput] SET [gcode] = @gcode, [pdate] = @pdate, [pidx] = @pidx, [projectName] = @projectName, [uid] = @uid, [requestpart] = @requestpart, [package] = @package, [status] = @status, [type] = @type, [process] = @process, [description] = @description, [remark] = @remark, [hrs] = @hrs, [ot] = @ot, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [description2] = @description2, [tag] = @tag, [autoinput] = @autoinput, [enable] = @enable, [edate] = @edate, [jobgrp] = @jobgrp WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_projectName = 1 AND [projectName] IS NULL) OR ([projectName] = @Original_projectName)) 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_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) 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_ot = 1 AND [ot] IS NULL) OR ([ot] = @Original_ot)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_tag = 1 AND [tag] IS NULL) OR ([tag] = @Original_tag)) AND ((@IsNull_autoinput = 1 AND [autoinput] IS NULL) OR ([autoinput] = @Original_autoinput)) AND ((@IsNull_enable = 1 AND [enable] IS NULL) OR ([enable] = @Original_enable)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_jobgrp = 1 AND [jobgrp] IS NULL) OR ([jobgrp] = @Original_jobgrp)));
-SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate FROM EETGW_JobReport_AutoInput WHERE (idx = @idx)</CommandText>
+SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, type, process, description, remark, hrs, ot, import, wuid, wdate, description2, tag, autoinput, enable, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, edate, jobgrp FROM EETGW_JobReport_AutoInput WHERE (idx = @idx)</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="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2316,6 +2319,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiStringFixedLength" Direction="Input" ParameterName="@autoinput" Precision="0" ProviderType="Char" Scale="0" Size="0" SourceColumn="autoinput" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" 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" />
                       <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="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="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -2354,6 +2358,8 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_enable" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="enable" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" 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.EETGW_JobReport_AutoInput" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -2386,6 +2392,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
               <Mapping SourceColumn="username" DataSetColumn="username" />
               <Mapping SourceColumn="ww" DataSetColumn="ww" />
               <Mapping SourceColumn="edate" DataSetColumn="edate" />
+              <Mapping SourceColumn="jobgrp" DataSetColumn="jobgrp" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -4892,6 +4899,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>
@@ -5198,7 +5212,7 @@ 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:element name="jobgrp" msprop:Generator_ColumnPropNameInTable="jobgrpColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="jobgrp" msprop:Generator_UserColumnName="jobgrp" msprop:Generator_ColumnVarNameInTable="columnjobgrp" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />

SubProject/FPJ0000/dsPRJ.xss

@@ -4,28 +4,28 @@
      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="1136" 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="-10" ViewPortY="257" 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:Projects" ZOrder="9" 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" />
+    <Shape ID="DesignTable:ProjectsIOMap" ZOrder="15" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:ProjectsMailList" ZOrder="21" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:ProjectsPart" ZOrder="5" X="973" Y="68" Height="381" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:ProjectsPart" ZOrder="6" X="973" Y="68" Height="381" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
     <Shape ID="DesignTable:ProjectsHistory" ZOrder="20" X="1881" Y="31" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:SPMaster" ZOrder="15" X="365" Y="305" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SPMaster" ZOrder="16" X="365" Y="305" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_Note" ZOrder="18" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_SaveCost" ZOrder="10" X="75" Y="490" Height="305" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_SaveCost" ZOrder="11" X="75" Y="490" Height="305" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ProjectPartStatus" ZOrder="7" X="1081" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ProjectPartStatus" ZOrder="8" X="1081" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjecthistoryD" ZOrder="16" X="680" Y="203" Height="248" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:EETGW_ProjecthistoryD" ZOrder="17" X="680" Y="203" Height="248" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="12" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="13" X="89" Y="808" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="11" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="12" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="17" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="1" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <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_ProjectsSchedule" ZOrder="7" 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:EETGW_ProjectReson" ZOrder="14" 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:vJobReportForUserList" ZOrder="10" X="590" Y="464" Height="115" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <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:JobReport" ZOrder="2" 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="4" 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="5" 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="3" 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="4" X="1200" Y="77" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
-    <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="DesignTable:SCTable" ZOrder="3" 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 />