..

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.08.02.1530")]
+[assembly: AssemblyVersion("23.08.09.1410")]
-[assembly: AssemblyFileVersion("23.08.02.1530")]
+[assembly: AssemblyFileVersion("23.08.09.1410")]

Project/fMain.Designer.cs

@@ -92,6 +92,7 @@
             this.근태입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가신청ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.개인별근태원장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.개인별근태집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
             this.출근부출력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가사용현황ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -116,6 +117,8 @@
             this.품목검색ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.즐겨찾기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btDev = new System.Windows.Forms.ToolStripMenuItem();
+            this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.휴가REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.purchaseOrderImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.materialImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -149,8 +152,6 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
-            this.메일전송ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.휴가REMINDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -376,6 +377,7 @@
             this.managementToolStripMenuItem.Name = "managementToolStripMenuItem";
             this.managementToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
             this.managementToolStripMenuItem.Text = "관리";
+            this.managementToolStripMenuItem.Click += new System.EventHandler(this.managementToolStripMenuItem_Click);
             // 
             // mn_purchase
             // 
@@ -615,6 +617,7 @@
             this.근태입력ToolStripMenuItem,
             this.휴가신청ToolStripMenuItem,
             this.개인별근태원장ToolStripMenuItem,
+            this.개인별근태집계표ToolStripMenuItem,
             this.toolStripMenuItem10,
             this.출근부출력ToolStripMenuItem,
             this.휴가사용현황ToolStripMenuItem,
@@ -670,6 +673,13 @@
             this.개인별근태원장ToolStripMenuItem.Text = "개인별 근태 원장";
             this.개인별근태원장ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태원장ToolStripMenuItem_Click);
             // 
+            // 개인별근태집계표ToolStripMenuItem
+            // 
+            this.개인별근태집계표ToolStripMenuItem.Name = "개인별근태집계표ToolStripMenuItem";
+            this.개인별근태집계표ToolStripMenuItem.Size = new System.Drawing.Size(248, 24);
+            this.개인별근태집계표ToolStripMenuItem.Text = "개인별 근태 집계표";
+            this.개인별근태집계표ToolStripMenuItem.Click += new System.EventHandler(this.개인별근태집계표ToolStripMenuItem_Click);
+            // 
             // toolStripMenuItem10
             // 
             this.toolStripMenuItem10.Name = "toolStripMenuItem10";
@@ -886,6 +896,21 @@
             this.btDev.Text = "개발자메뉴";
             this.btDev.Visible = false;
             // 
+            // 메일전송ToolStripMenuItem1
+            // 
+            this.메일전송ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.휴가REMINDToolStripMenuItem});
+            this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1";
+            this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24);
+            this.메일전송ToolStripMenuItem1.Text = "메일전송";
+            // 
+            // 휴가REMINDToolStripMenuItem
+            // 
+            this.휴가REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem";
+            this.휴가REMINDToolStripMenuItem.Size = new System.Drawing.Size(166, 24);
+            this.휴가REMINDToolStripMenuItem.Text = "휴가-REMIND";
+            this.휴가REMINDToolStripMenuItem.Click += new System.EventHandler(this.휴가REMINDToolStripMenuItem_Click);
+            // 
             // purchaseImportToolStripMenuItem
             // 
             this.purchaseImportToolStripMenuItem.Name = "purchaseImportToolStripMenuItem";
@@ -1161,21 +1186,6 @@
             this.toolStripButton3.ToolTipText = "휴가신청";
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
-            // 메일전송ToolStripMenuItem1
-            // 
-            this.메일전송ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.휴가REMINDToolStripMenuItem});
-            this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1";
-            this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(302, 24);
-            this.메일전송ToolStripMenuItem1.Text = "메일전송";
-            // 
-            // 휴가REMINDToolStripMenuItem
-            // 
-            this.휴가REMINDToolStripMenuItem.Name = "휴가REMINDToolStripMenuItem";
-            this.휴가REMINDToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.휴가REMINDToolStripMenuItem.Text = "휴가-REMIND";
-            this.휴가REMINDToolStripMenuItem.Click += new System.EventHandler(this.휴가REMINDToolStripMenuItem_Click);
-            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1329,6 +1339,7 @@
         private System.Windows.Forms.ToolStripMenuItem bwrunToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 메일전송ToolStripMenuItem1;
         private System.Windows.Forms.ToolStripMenuItem 휴가REMINDToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 개인별근태집계표ToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -1444,5 +1444,17 @@ namespace Project
         {
             Mail_Take_a_rest_remind();
         }
+
+        private void 개인별근태집계표ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var uid = FCOMMON.info.Login.nameK + "(" + FCOMMON.info.Login.no + ")";
+            var f = new FBS0000.fHolyDayDataSum(DateTime.Now.ToShortDateString(), uid);
+            f.Show();
+        }
+
+        private void managementToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Project/fMain.resx

@@ -452,14 +452,14 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
         h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
-        /U7m/E+5XP8/92TF/3lzYj/ULMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
+        /U7m/E+5XP8/92TF/3lzYj/UzM//l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPJV+p/1Z8q+d/yc2e
-        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+Ptnr+vV7o9blnWyHc
+        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf8Pt7r/vV7o9blnWyHc
         gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi
         v2iNEH9c5vn/SobWnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
         LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
-        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bpgd7fQPo/MoaKnQGr
+        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bxgd7fQPo/MoaKnQGr
-        2d+jAdUG1LhtIjtQcP7TZfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        2d+jAdUG1LhtIjtQcP7jJfX/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
-        BQAOjqr9dEfZwgAAAABJRU5ErkJggg==
+        BQDzP6rrBTxFGAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FBS0000/FBS0000.csproj

@@ -152,6 +152,12 @@
     <Compile Include="Holiday\fErrorChk.Designer.cs">
       <DependentUpon>fErrorChk.cs</DependentUpon>
     </Compile>
+    <Compile Include="Holiday\fHolyDayDataSum.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Holiday\fHolyDayDataSum.Designer.cs">
+      <DependentUpon>fHolyDayDataSum.cs</DependentUpon>
+    </Compile>
     <Compile Include="Holiday\fImpKunTae.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -245,6 +251,9 @@
     <EmbeddedResource Include="Holiday\fErrorChk.resx">
       <DependentUpon>fErrorChk.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Holiday\fHolyDayDataSum.resx">
+      <DependentUpon>fHolyDayDataSum.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Holiday\fImpKunTae.resx">
       <DependentUpon>fImpKunTae.cs</DependentUpon>
     </EmbeddedResource>
@@ -254,6 +263,7 @@
     <EmbeddedResource Include="Holiday\fHolyDayData.resx">
       <DependentUpon>fHolyDayData.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Holiday\rHolyDataSum.rdlc" />
     <EmbeddedResource Include="Holiday\rHolyData.rdlc" />
     <EmbeddedResource Include="Holiday\WorkTable.resx">
       <DependentUpon>WorkTable.cs</DependentUpon>

SubProject/FBS0000/Holiday/fHolyDayDataSum.Designer.cs

@@ -0,0 +1,226 @@
+namespace FBS0000
+{
+    partial class fHolyDayDataSum
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayDataSum));
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.bsDay = new System.Windows.Forms.BindingSource(this.components);
+            this.dsReport = new FBS0000.dsReport();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
+            this.lbStt = new System.Windows.Forms.ToolStripLabel();
+            this.tbMon = new System.Windows.Forms.ToolStripTextBox();
+            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.btSearch = new System.Windows.Forms.ToolStripButton();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbType = new System.Windows.Forms.ToolStripComboBox();
+            this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.taDay = new FBS0000.dsReportTableAdapters.Holydata_DayTableAdapter();
+            this.bsTime = new System.Windows.Forms.BindingSource(this.components);
+            this.taTime = new FBS0000.dsReportTableAdapters.Holydata_timee_adapter();
+            this.Holydata_DayBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.bsDay)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
+            this.toolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsTime)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Holydata_DayBindingSource)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // bsDay
+            // 
+            this.bsDay.DataMember = "Holydata_Day";
+            this.bsDay.DataSource = this.dsReport;
+            // 
+            // dsReport
+            // 
+            this.dsReport.DataSetName = "dsReport";
+            this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton8,
+            this.lbStt,
+            this.tbMon,
+            this.toolStripButton7,
+            this.toolStripSeparator2,
+            this.btSearch,
+            this.toolStripLabel1,
+            this.cmbType});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(1059, 37);
+            this.toolStrip1.TabIndex = 6;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // toolStripButton8
+            // 
+            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
+            this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton8.Name = "toolStripButton8";
+            this.toolStripButton8.Size = new System.Drawing.Size(34, 34);
+            this.toolStripButton8.Text = "toolStripButton7";
+            this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click);
+            // 
+            // lbStt
+            // 
+            this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.lbStt.ForeColor = System.Drawing.Color.Black;
+            this.lbStt.LinkColor = System.Drawing.Color.Black;
+            this.lbStt.Name = "lbStt";
+            this.lbStt.Size = new System.Drawing.Size(47, 34);
+            this.lbStt.Text = "기준 일";
+            // 
+            // tbMon
+            // 
+            this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.tbMon.Name = "tbMon";
+            this.tbMon.Size = new System.Drawing.Size(90, 37);
+            this.tbMon.Text = "1982";
+            this.tbMon.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // toolStripButton7
+            // 
+            this.toolStripButton7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
+            this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton7.Name = "toolStripButton7";
+            this.toolStripButton7.Size = new System.Drawing.Size(34, 34);
+            this.toolStripButton7.Text = "toolStripButton7";
+            this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37);
+            // 
+            // btSearch
+            // 
+            this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image")));
+            this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btSearch.Name = "btSearch";
+            this.btSearch.Size = new System.Drawing.Size(80, 34);
+            this.btSearch.Text = "조회(&R)";
+            this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(55, 34);
+            this.toolStripLabel1.Text = "출력형태";
+            // 
+            // cmbType
+            // 
+            this.cmbType.Items.AddRange(new object[] {
+            "일반 원장",
+            "대체 원장"});
+            this.cmbType.Name = "cmbType";
+            this.cmbType.Size = new System.Drawing.Size(150, 37);
+            this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
+            this.cmbType.Click += new System.EventHandler(this.cmbType_Click);
+            // 
+            // reportViewer1
+            // 
+            this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            reportDataSource1.Name = "DataSet1";
+            reportDataSource1.Value = this.bsDay;
+            this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
+            this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc";
+            this.reportViewer1.Location = new System.Drawing.Point(0, 37);
+            this.reportViewer1.Name = "reportViewer1";
+            this.reportViewer1.ServerReport.BearerToken = null;
+            this.reportViewer1.Size = new System.Drawing.Size(1059, 543);
+            this.reportViewer1.TabIndex = 7;
+            this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
+            // 
+            // taDay
+            // 
+            this.taDay.ClearBeforeFill = true;
+            // 
+            // bsTime
+            // 
+            this.bsTime.DataMember = "Holydata_Time";
+            this.bsTime.DataSource = this.dsReport;
+            // 
+            // taTime
+            // 
+            this.taTime.ClearBeforeFill = true;
+            // 
+            // Holydata_DayBindingSource
+            // 
+            this.Holydata_DayBindingSource.DataMember = "Holydata_Day";
+            this.Holydata_DayBindingSource.DataSource = this.dsReport;
+            // 
+            // fHolyDayDataSum
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1059, 580);
+            this.Controls.Add(this.reportViewer1);
+            this.Controls.Add(this.toolStrip1);
+            this.Name = "fHolyDayDataSum";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "근태 집계표";
+            this.Load += new System.EventHandler(this.rJobReport_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsTime)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Holydata_DayBindingSource)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private dsReport dsReport;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton toolStripButton8;
+        private System.Windows.Forms.ToolStripLabel lbStt;
+        private System.Windows.Forms.ToolStripTextBox tbMon;
+        private System.Windows.Forms.ToolStripButton toolStripButton7;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripButton btSearch;
+        private Microsoft.Reporting.WinForms.ReportViewer reportViewer1;
+        private System.Windows.Forms.BindingSource bsDay;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+        private System.Windows.Forms.ToolStripComboBox cmbType;
+        private dsReportTableAdapters.Holydata_DayTableAdapter taDay;
+        private System.Windows.Forms.BindingSource bsTime;
+        private dsReportTableAdapters.Holydata_timee_adapter taTime;
+        private System.Windows.Forms.BindingSource Holydata_DayBindingSource;
+    }
+}

SubProject/FBS0000/Holiday/fHolyDayDataSum.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FBS0000
+{
+    public partial class fHolyDayDataSum : Form
+    {
+        bool binit = false;
+        public fHolyDayDataSum(string sdate, string uid)
+        {
+            InitializeComponent();
+            Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
+            this.WindowState = FormWindowState.Maximized;
+
+            //var dtUser = FCOMMON.DBM.getUserTable();
+            //this.cmbUser.Items.Clear();
+            //this.cmbUser.Items.Add("-- ALL --");
+            //foreach (DataRow dr in dtUser.Rows)
+            //{
+            //    this.cmbUser.Items.Add(dr["dispname"].ToString());
+            //}
+            //cmbUser.Text = uid;
+
+            //if (cmbUser.SelectedIndex < 0)
+            //    cmbUser.SelectedIndex = 0;
+
+            this.tbMon.Text = DateTime.Now.ToShortDateString();
+            cmbType.SelectedIndex = 0; //일기준으로한다
+
+        }
+
+        private void rJobReport_Load(object sender, EventArgs e)
+        {            
+            refreshData();
+            binit = true;
+
+        }
+        //string GetUIDValue()
+        //{
+        //    string uid = "%";
+        //    if (cmbUser.SelectedIndex > 0)
+        //    {
+        //        var si = cmbUser.Text.IndexOf("(");
+        //        var ei = cmbUser.Text.LastIndexOf(")");
+        //        uid = cmbUser.Text.Substring(si + 1, ei - si - 1);
+        //    }
+        //    return uid;
+        //}
+
+        void refreshData()
+        {
+
+            var ed = DateTime.Parse(this.tbMon.Text);
+            var sd = DateTime.Parse(ed.ToString("yyyy") + "-01-01");
+
+            //this.reportViewer1.LocalReport.DataSources.Clear();
+            var uid = "%";// GetUIDValue();
+            if (cmbType.SelectedIndex == 0)
+            {
+                taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
+            }
+            else
+            {
+                taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
+                dsReport.Holydata_Day.Clear();
+                dsReport.Holydata_Day.Merge(dsReport.Holydata_Time);
+                dsReport.Holydata_Day.AcceptChanges();
+                //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
+            }
+
+            
+            this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
+            this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
+            this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
+            this.reportViewer1.RefreshReport();
+
+
+
+        }
+
+        private void btRefresh_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+
+        }
+
+        private void toolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // if (tbProcess.SelectedIndex >= 0) refrehData();
+        }
+
+        private void toolStripButton6_Click(object sender, EventArgs e)
+        {
+            // dataGridView1.ExportData(string.Empty);
+        }
+
+        private void btSearch_Click(object sender, EventArgs e)
+        {
+            refreshData();
+        }
+
+        private void toolStripButton8_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(this.tbMon.Text);
+            var sd = sdo.AddMonths(-1);
+            tbMon.Text = sd.ToShortDateString();
+        }
+
+        private void toolStripButton7_Click(object sender, EventArgs e)
+        {
+            var sdo = DateTime.Parse(this.tbMon.Text);
+            var sd = sdo.AddMonths(1);
+            tbMon.Text = sd.ToShortDateString();
+        }
+
+        private void reportViewer1_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void lbStt_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbType_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(binit)
+            refreshData();
+        }
+    }
+}

SubProject/FBS0000/Holiday/fHolyDayDataSum.resx

@@ -0,0 +1,193 @@
+<?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="bsDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>225, 17</value>
+  </metadata>
+  <metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>119, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
+        C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX
+        wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY
+        TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ
+        fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j
+        p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS
+        qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3
+        ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG
+        3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8
+        UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv
+        UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb
+        mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4
+        6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo
+        JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA
+        BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
+        8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
+        c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+        VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
+        /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
+        A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
+        CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK
+        ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP
+        uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi
+        8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF
+        UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40
+        3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
+        613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
+        t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
+        UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPtZPPasJAEMbzPn0FwWA92JtP4NGKB1/DP7ei
+        QSsovkChh7ZBrCfpyR4sikopUgq9StFzM/UbZ5asSS4FfzAkO7vft5udiZMEnSBpk5dhFJmncjdHxXaG
+        A+9K4SbFT1luEwQBbXavVO5d0nI3ovnW5yeiMriiu+kt5asXbABEdgRigAUQDr+aHLU3lxoLl/yPJhvF
+        GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG
+        cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E
+        dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="taDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>311, 17</value>
+  </metadata>
+  <metadata name="bsTime.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>395, 17</value>
+  </metadata>
+  <metadata name="taTime.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>486, 17</value>
+  </metadata>
+  <metadata name="Holydata_DayBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>575, 17</value>
+  </metadata>
+</root>

SubProject/FBS0000/Holiday/rHolyDataSum.rdlc

@@ -0,0 +1,825 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
+  <Body>
+    <ReportItems>
+      <Tablix Name="Tablix1">
+        <TablixCorner>
+          <TablixCornerRows>
+            <TablixCornerRow>
+              <TablixCornerCell>
+                <CellContents>
+                  <Textbox Name="Textbox4">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>담당자</Value>
+                            <Style />
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox4</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                  <RowSpan>2</RowSpan>
+                </CellContents>
+              </TablixCornerCell>
+            </TablixCornerRow>
+            <TablixCornerRow>
+              <TablixCornerCell />
+            </TablixCornerRow>
+          </TablixCornerRows>
+        </TablixCorner>
+        <TablixBody>
+          <TablixColumns>
+            <TablixColumn>
+              <Width>0.93896cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>0.85958cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.01833cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.25646cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.12417cm</Width>
+            </TablixColumn>
+            <TablixColumn>
+              <Width>1.15063cm</Width>
+            </TablixColumn>
+          </TablixColumns>
+          <TablixRows>
+            <TablixRow>
+              <Height>0.74083cm</Height>
+              <TablixCells>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Dr">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!Dr.Value)</Value>
+                              <Style />
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Dr</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Cr">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!Cr.Value)</Value>
+                              <Style />
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Cr</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Dr1">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!Dr.Value)</Value>
+                              <Style>
+                                <Format>N1</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Dr1</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Cr1">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!Cr.Value)</Value>
+                              <Style>
+                                <Format>N1</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Cr1</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox17">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=last(fields!jan.Value)</Value>
+                              <Style>
+                                <Format>N1</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox17</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox21">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=sum(fields!Cr.Value)/ sum(fields!Dr.Value) * 100.0</Value>
+                              <Style>
+                                <Format>N0</Format>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style />
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox21</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Style>Solid</Style>
+                        </Border>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                    <rd:Selected>true</rd:Selected>
+                  </CellContents>
+                </TablixCell>
+              </TablixCells>
+            </TablixRow>
+          </TablixRows>
+        </TablixBody>
+        <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="sdate1">
+                <GroupExpressions>
+                  <GroupExpression>=left(Fields!sdate.Value,7)</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!sdate.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>0.68792cm</Size>
+                <CellContents>
+                  <Textbox Name="sdate1">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>=left(Fields!sdate.Value,7)</Value>
+                            <Style />
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>sdate1</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
+              <TablixMembers>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox37">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>발생</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox37</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                  <TablixMembers>
+                    <TablixMember />
+                  </TablixMembers>
+                </TablixMember>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox36">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>사용</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox32</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                  <TablixMembers>
+                    <TablixMember />
+                  </TablixMembers>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>0.68792cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox45">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>전체</Value>
+                            <Style />
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox45</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
+              <TablixMembers>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox46">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>발생</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox46</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox49">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>사용</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox49</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox39">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>잔량</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox34</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>0.68792cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox20">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>사용</Value>
+                            <Style />
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox20</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
+              <TablixMembers>
+                <TablixMember>
+                  <TablixHeader>
+                    <Size>0.6cm</Size>
+                    <CellContents>
+                      <Textbox Name="Textbox41">
+                        <CanGrow>true</CanGrow>
+                        <KeepTogether>true</KeepTogether>
+                        <Paragraphs>
+                          <Paragraph>
+                            <TextRuns>
+                              <TextRun>
+                                <Value>%</Value>
+                                <Style />
+                              </TextRun>
+                            </TextRuns>
+                            <Style>
+                              <TextAlign>Center</TextAlign>
+                            </Style>
+                          </Paragraph>
+                        </Paragraphs>
+                        <rd:DefaultName>Textbox41</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+          </TablixMembers>
+        </TablixColumnHierarchy>
+        <TablixRowHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="uid">
+                <GroupExpressions>
+                  <GroupExpression>="[" &amp; Fields!uid.Value &amp; "] " &amp; Fields!name.Value</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!uid.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>2.97656cm</Size>
+                <CellContents>
+                  <Textbox Name="uid">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>="[" &amp; Fields!uid.Value &amp; "] " &amp; Fields!name.Value</Value>
+                            <Style />
+                          </TextRun>
+                        </TextRuns>
+                        <Style />
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>uid</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Style>Solid</Style>
+                      </Border>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                  <rd:Selected>true</rd:Selected>
+                </CellContents>
+              </TablixHeader>
+              <TablixMembers>
+                <TablixMember />
+              </TablixMembers>
+            </TablixMember>
+          </TablixMembers>
+        </TablixRowHierarchy>
+        <RepeatColumnHeaders>true</RepeatColumnHeaders>
+        <RepeatRowHeaders>true</RepeatRowHeaders>
+        <DataSetName>DataSet1</DataSetName>
+        <Height>2.02875cm</Height>
+        <Width>9.32469cm</Width>
+        <Style>
+          <Border>
+            <Style>None</Style>
+          </Border>
+        </Style>
+      </Tablix>
+    </ReportItems>
+    <Height>0.79872in</Height>
+    <Style />
+  </Body>
+  <Width>11.00755in</Width>
+  <Page>
+    <PageFooter>
+      <Height>0.77625cm</Height>
+      <PrintOnFirstPage>true</PrintOnFirstPage>
+      <PrintOnLastPage>true</PrintOnLastPage>
+      <ReportItems>
+        <Textbox Name="Textbox89">
+          <CanGrow>true</CanGrow>
+          <KeepTogether>true</KeepTogether>
+          <Paragraphs>
+            <Paragraph>
+              <TextRuns>
+                <TextRun>
+                  <Value>=Globals!PageNumber &amp; "/" &amp; Globals!TotalPages</Value>
+                  <Style>
+                    <FontFamily>맑은 고딕</FontFamily>
+                    <FontWeight>Normal</FontWeight>
+                    <Color>#333333</Color>
+                  </Style>
+                </TextRun>
+              </TextRuns>
+              <Style>
+                <TextAlign>Center</TextAlign>
+              </Style>
+            </Paragraph>
+          </Paragraphs>
+          <rd:DefaultName>Textbox88</rd:DefaultName>
+          <Top>0.17625cm</Top>
+          <Height>0.6cm</Height>
+          <Width>27.95916cm</Width>
+          <Style>
+            <Border>
+              <Style>None</Style>
+            </Border>
+            <BackgroundColor>White</BackgroundColor>
+            <VerticalAlign>Middle</VerticalAlign>
+            <PaddingLeft>2pt</PaddingLeft>
+            <PaddingRight>2pt</PaddingRight>
+            <PaddingTop>2pt</PaddingTop>
+            <PaddingBottom>2pt</PaddingBottom>
+          </Style>
+        </Textbox>
+      </ReportItems>
+      <Style>
+        <Border>
+          <Style>None</Style>
+        </Border>
+      </Style>
+    </PageFooter>
+    <PageHeight>21cm</PageHeight>
+    <PageWidth>29.7cm</PageWidth>
+    <LeftMargin>0.7cm</LeftMargin>
+    <RightMargin>0.5cm</RightMargin>
+    <TopMargin>0.5cm</TopMargin>
+    <BottomMargin>0.5cm</BottomMargin>
+    <ColumnSpacing>0.13cm</ColumnSpacing>
+    <Style />
+  </Page>
+  <AutoRefresh>0</AutoRefresh>
+  <DataSources>
+    <DataSource Name="dsReport">
+      <ConnectionProperties>
+        <DataProvider>System.Data.DataSet</DataProvider>
+        <ConnectString>/* Local Connection */</ConnectString>
+      </ConnectionProperties>
+      <rd:DataSourceID>397f6768-095d-4332-a8ba-84746f828e97</rd:DataSourceID>
+    </DataSource>
+  </DataSources>
+  <DataSets>
+    <DataSet Name="DataSet1">
+      <Query>
+        <DataSourceName>dsReport</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="idx">
+          <DataField>idx</DataField>
+          <rd:TypeName>System.Int32</rd:TypeName>
+        </Field>
+        <Field Name="sdate">
+          <DataField>sdate</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="uid">
+          <DataField>uid</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="cate">
+          <DataField>cate</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="jun">
+          <DataField>jun</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>
+        <Field Name="Dr">
+          <DataField>Dr</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>
+        <Field Name="Cr">
+          <DataField>Cr</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>
+        <Field Name="contents">
+          <DataField>contents</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="gcode">
+          <DataField>gcode</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="name">
+          <DataField>name</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="Process">
+          <DataField>Process</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
+        <Field Name="jan">
+          <DataField>jan</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>dsReport</rd:DataSetName>
+        <rd:SchemaPath>D:\Source\##### 완료아이템\(0014) GroupWare\Source\SubProject\FBS0000\dsReport.xsd</rd:SchemaPath>
+        <rd:TableName>Holydata_Day</rd:TableName>
+        <rd:TableAdapterFillMethod>Fill</rd:TableAdapterFillMethod>
+        <rd:TableAdapterGetDataMethod>GetData</rd:TableAdapterGetDataMethod>
+        <rd:TableAdapterName>Holydata_DayTableAdapter</rd:TableAdapterName>
+      </rd:DataSetInfo>
+    </DataSet>
+  </DataSets>
+  <rd:ReportUnitType>Cm</rd:ReportUnitType>
+  <rd:ReportID>9ff3d5f5-0e1e-42f8-9670-66e28546453a</rd:ReportID>
+</Report>

SubProject/FEQ0000/Purchase/fPurchase_Add.cs

@@ -28,6 +28,8 @@ namespace FEQ0000
             Properties.Settings.Default["gwcs"] = FCOMMON.info.CS;
             Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS;
 
+            
+
             bsManu = new BindingSource();
             bsModel = new BindingSource();
             this.dr = dr_;
@@ -262,6 +264,10 @@ namespace FEQ0000
             {
                 sidchk1 = string.Empty;
                 dbchk1 = string.Empty;
+
+                //복사된 자료는 isd가 잇으면 sid가 잇다면 자동 처리해준다.
+                if (tbSID.Text.StartsWith("10") && tbSID.TextLength == 9)
+                    dbchk1 = tbPumName.Text;
             }
             else
             {

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs

@@ -301,6 +301,10 @@ namespace FEQ0000
             {
                 sidchk1 = string.Empty;
                 dbchk1 = string.Empty;
+
+                //복사된 자료는 isd가 잇으면 sid가 잇다면 자동 처리해준다.
+                if (tbSID.Text.StartsWith("10") && tbSID.TextLength == 9)
+                    dbchk1 = tbPumName.Text;
             }   
             else
             {

SubProject/FPJ0000/Project/fProjectData.Designer.cs

@@ -57,8 +57,8 @@
             System.Windows.Forms.Label label16;
             System.Windows.Forms.Label label17;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsPRJ = new FPJ0000.dsPRJ();
@@ -773,6 +773,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";
@@ -923,8 +924,8 @@
             // 
             this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle15;
+            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridViewTextBoxColumn10.HeaderText = "비고";
             this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
             this.dataGridViewTextBoxColumn10.ReadOnly = true;
@@ -1165,21 +1166,21 @@
             // chkCostSave
             // 
             this.chkCostSave.AutoSize = true;
-            this.chkCostSave.Location = new System.Drawing.Point(251, 122);
+            this.chkCostSave.Location = new System.Drawing.Point(264, 122);
             this.chkCostSave.Name = "chkCostSave";
-            this.chkCostSave.Size = new System.Drawing.Size(98, 16);
+            this.chkCostSave.Size = new System.Drawing.Size(78, 16);
             this.chkCostSave.TabIndex = 100;
-            this.chkCostSave.Text = "chkCostSave";
+            this.chkCostSave.Text = "CostSave";
             this.chkCostSave.UseVisualStyleBackColor = true;
             // 
             // chkHigh
             // 
             this.chkHigh.AutoSize = true;
-            this.chkHigh.Location = new System.Drawing.Point(169, 122);
+            this.chkHigh.Location = new System.Drawing.Point(173, 122);
             this.chkHigh.Name = "chkHigh";
-            this.chkHigh.Size = new System.Drawing.Size(76, 16);
+            this.chkHigh.Size = new System.Drawing.Size(84, 16);
             this.chkHigh.TabIndex = 99;
-            this.chkHigh.Text = "HighLight";
+            this.chkHigh.Text = "Major Item";
             this.chkHigh.UseVisualStyleBackColor = true;
             // 
             // tbPno
@@ -1980,6 +1981,7 @@
             // 
             this.bindingNavigatorPositionItem1.AccessibleName = "위치";
             this.bindingNavigatorPositionItem1.AutoSize = false;
+            this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1";
             this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem1.Text = "0";
@@ -2403,7 +2405,7 @@
             this.tabPage4.Location = new System.Drawing.Point(4, 22);
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage4.Size = new System.Drawing.Size(564, 303);
+            this.tabPage4.Size = new System.Drawing.Size(660, 336);
             this.tabPage4.TabIndex = 1;
             this.tabPage4.Text = "메모";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -2432,7 +2434,7 @@
             this.arPanel4.ProgressValue = 0F;
             this.arPanel4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
             this.arPanel4.ShowBorder = true;
-            this.arPanel4.Size = new System.Drawing.Size(558, 297);
+            this.arPanel4.Size = new System.Drawing.Size(654, 330);
             this.arPanel4.TabIndex = 90;
             this.arPanel4.Text = "arPanel4";
             this.arPanel4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -2461,7 +2463,7 @@
             this.dataGridView2.RowHeadersVisible = false;
             this.dataGridView2.RowTemplate.Height = 23;
             this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView2.Size = new System.Drawing.Size(556, 270);
+            this.dataGridView2.Size = new System.Drawing.Size(652, 303);
             this.dataGridView2.TabIndex = 0;
             this.dataGridView2.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView2_DataError);
             // 
@@ -2486,8 +2488,8 @@
             // 
             this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn5.DataPropertyName = "remark";
-            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle16;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridViewTextBoxColumn5.HeaderText = "비고";
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
             this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -2517,14 +2519,14 @@
             this.toolStripButton5,
             this.toolStripButton6,
             this.toolStripButton7});
-            this.bindingNavigator2.Location = new System.Drawing.Point(1, 271);
+            this.bindingNavigator2.Location = new System.Drawing.Point(1, 304);
             this.bindingNavigator2.MoveFirstItem = this.toolStripButton1;
             this.bindingNavigator2.MoveLastItem = this.toolStripButton4;
             this.bindingNavigator2.MoveNextItem = this.toolStripButton3;
             this.bindingNavigator2.MovePreviousItem = this.toolStripButton2;
             this.bindingNavigator2.Name = "bindingNavigator2";
             this.bindingNavigator2.PositionItem = this.toolStripTextBox1;
-            this.bindingNavigator2.Size = new System.Drawing.Size(556, 25);
+            this.bindingNavigator2.Size = new System.Drawing.Size(652, 25);
             this.bindingNavigator2.TabIndex = 87;
             this.bindingNavigator2.Text = "bindingNavigator2";
             // 
@@ -2562,6 +2564,7 @@
             // 
             this.toolStripTextBox1.AccessibleName = "위치";
             this.toolStripTextBox1.AutoSize = false;
+            this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.toolStripTextBox1.Name = "toolStripTextBox1";
             this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23);
             this.toolStripTextBox1.Text = "0";

SubProject/FPJ0000/Project/fProjectData.resx

@@ -217,7 +217,7 @@
   <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -228,7 +228,7 @@
   <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -237,7 +237,7 @@
   <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -246,7 +246,7 @@
   <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -410,7 +410,7 @@
   <data name="bindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -421,7 +421,7 @@
   <data name="bindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -430,7 +430,7 @@
   <data name="bindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -439,7 +439,7 @@
   <data name="bindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -450,7 +450,7 @@
   <data name="btwADd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/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
@@ -477,7 +477,7 @@
   <data name="btwDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -501,7 +501,7 @@
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
         wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
         v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
         UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -512,7 +512,7 @@
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
         5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
         Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
         08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -521,7 +521,7 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
         n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
         N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
         oAc0QjgAAAAASUVORK5CYII=
@@ -530,7 +530,7 @@
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
         h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
         twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -541,7 +541,7 @@
   <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/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
@@ -568,7 +568,7 @@
   <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
         DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
         rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
         i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -115,7 +115,6 @@
             this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.cmbDateType = new System.Windows.Forms.ToolStripComboBox();
             this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
@@ -198,13 +197,13 @@
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.label17 = new System.Windows.Forms.Label();
             this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter();
+            this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
             this.cm.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.toolStrip1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsHistD)).BeginInit();
@@ -217,6 +216,7 @@
             this.toolStrip2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -309,7 +309,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -432,7 +431,6 @@
             // tbFind
             // 
             this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFind.Name = "tbFind";
             this.tbFind.Size = new System.Drawing.Size(100, 25);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -673,275 +671,6 @@
             this.fpSpread1.TabIndex = 2;
             this.fpSpread1.SetViewportLeftColumn(0, 0, 8);
             // 
-            // 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 = 34;
-            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
-            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
-            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
-            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 7;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " ";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 4;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Cost Save";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "Fan Out";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "High Light";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수(%)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "완료(%)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "검토\r\n기한";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Start Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Due Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Done Date";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Q\'ty";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Outsourced Cost ($K)/Set\r\n";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "In-house Cost ($K/Set)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Cost Save ($k)/Set";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Champion";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "S/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Design";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "자스민";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType1.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
-            this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
-            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo";
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment";
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite";
-            this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site";
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant";
-            this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant";
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage";
-            this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG";
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine";
-            this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line";
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part";
-            this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team";
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType3.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate";
-            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수(%)";
-            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료(%)";
-            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status";
-            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한";
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date";
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate";
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date";
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate";
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date";
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt";
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty";
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F;
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n";
-            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
-            numberCellType7.MaximumValue = 999999999999999D;
-            numberCellType7.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn";
-            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)";
-            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType8.MaximumValue = 999999999999999D;
-            numberCellType8.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste";
-            this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set";
-            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F;
-            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno";
-            this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF";
-            this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14;
-            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_champion";
-            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(21).Label = "Champion";
-            this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
-            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_software";
-            this.fpSpread1_Sheet1.Columns.Get(22).Label = "S/W";
-            this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
-            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_design";
-            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(23).Label = "Design";
-            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
-            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel";
-            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel";
-            this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
-            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory";
-            this.fpSpread1_Sheet1.Columns.Get(25).Label = "History";
-            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19;
-            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo";
-            this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo";
-            this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20;
-            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset";
-            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset";
-            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21;
-            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model";
-            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#";
-            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22;
-            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial";
-            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#";
-            this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType9.DecimalPlaces = 0;
-            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin";
-            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민";
-            this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(31).CellType = checkBoxCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "bCost";
-            this.fpSpread1_Sheet1.Columns.Get(31).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(32).CellType = checkBoxCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "bFanOut";
-            this.fpSpread1_Sheet1.Columns.Get(32).Width = 44F;
-            this.fpSpread1_Sheet1.Columns.Get(33).CellType = checkBoxCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "bHighlight";
-            this.fpSpread1_Sheet1.Columns.Get(33).Width = 39F;
-            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
-            this.fpSpread1_Sheet1.DataSource = this.bs;
-            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
-            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
-            // 
             // toolStrip1
             // 
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
@@ -1065,7 +794,6 @@
             // tbRequest
             // 
             this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbRequest.Name = "tbRequest";
             this.tbRequest.Size = new System.Drawing.Size(120, 25);
             this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -1975,6 +1703,278 @@
             // 
             this.taHistD.ClearBeforeFill = true;
             // 
+            // 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 = 34;
+            this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
+            this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+            this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+            this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 7;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " ";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 4;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 31).Value = "Cost Save";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 32).Value = "Fan Out";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 33).Value = "Major Item";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수(%)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "완료(%)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "검토\r\n기한";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Start Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Due Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Done Date";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Q\'ty";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Outsourced Cost ($K)/Set\r\n";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "In-house Cost ($K/Set)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Cost Save ($k)/Set";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Champion";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "S/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Design";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "자스민";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Major Item";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType1.DecimalPlaces = 0;
+            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType1.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
+            this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
+            this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
+            numberCellType2.DecimalPlaces = 0;
+            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType2.MaximumValue = 2147483647D;
+            numberCellType2.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment";
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite";
+            this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site";
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant";
+            this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant";
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage";
+            this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG";
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine";
+            this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line";
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part";
+            this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team";
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType3.DecimalPlaces = 0;
+            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType3.MaximumValue = 2147483647D;
+            numberCellType3.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate";
+            this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수(%)";
+            this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType4.DecimalPlaces = 0;
+            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType4.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료(%)";
+            this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status";
+            this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한";
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date";
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date";
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date";
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType5.DecimalPlaces = 0;
+            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType5.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt";
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty";
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F;
+            numberCellType6.MaximumValue = 999999999999999D;
+            numberCellType6.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
+            numberCellType7.MaximumValue = 999999999999999D;
+            numberCellType7.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn";
+            this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)";
+            this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType8.MaximumValue = 999999999999999D;
+            numberCellType8.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste";
+            this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set";
+            this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F;
+            this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno";
+            this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF";
+            this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_champion";
+            this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(21).Label = "Champion";
+            this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_software";
+            this.fpSpread1_Sheet1.Columns.Get(22).Label = "S/W";
+            this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_design";
+            this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(23).Label = "Design";
+            this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel";
+            this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel";
+            this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory";
+            this.fpSpread1_Sheet1.Columns.Get(25).Label = "History";
+            this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo";
+            this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo";
+            this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F;
+            this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset";
+            this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset";
+            this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model";
+            this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#";
+            this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial";
+            this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#";
+            this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType9.DecimalPlaces = 0;
+            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType9.MaximumValue = 2147483647D;
+            numberCellType9.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin";
+            this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민";
+            this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(31).CellType = checkBoxCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(31).DataField = "bCost";
+            this.fpSpread1_Sheet1.Columns.Get(31).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(32).CellType = checkBoxCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(32).DataField = "bFanOut";
+            this.fpSpread1_Sheet1.Columns.Get(32).Width = 44F;
+            this.fpSpread1_Sheet1.Columns.Get(33).CellType = checkBoxCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(33).DataField = "bHighlight";
+            this.fpSpread1_Sheet1.Columns.Get(33).Label = "Major Item";
+            this.fpSpread1_Sheet1.Columns.Get(33).Tag = "Highlight";
+            this.fpSpread1_Sheet1.Columns.Get(33).Width = 39F;
+            this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+            this.fpSpread1_Sheet1.DataSource = this.bs;
+            this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+            // 
             // fProjectList
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1996,7 +1996,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
             this.cm.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
@@ -2012,6 +2011,7 @@
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.tableLayoutPanel3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FPJ0000/Project/fProjectList.cs

@@ -254,13 +254,21 @@ namespace FPJ0000
             //삭제컬럼인덱스
             this.fpSpread1.SuspendLayout();
             var statindex = this.fpSpread1.ActiveSheet.Columns["Status"].Index;
+            var majorindex = this.fpSpread1.ActiveSheet.Columns["Highlight"].Index;
             for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
             {
+                var major = this.fpSpread1.ActiveSheet.GetValue(i, majorindex);
                 var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex);
                 string stateStr = string.Empty;
+                string majorstr = string.Empty;
+                if (major != null) majorstr = major.ToString();
                 if (state != null) stateStr = state.ToString();
 
-                this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White;
+                if (majorstr == "True")
+                    this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Lime;
+                else
+                    this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White;
+
                 switch (stateStr.ToLower())
                 {
                     case "검토":
@@ -547,7 +555,7 @@ namespace FPJ0000
             this.label1.Text = string.Format("[{0}] {1}", dr.name, dr.memo);
 
             button2.BackColor = dr.jasmin > 0 ? Color.Lime : SystemColors.Control;
-     
+
 
             var progress = FCOMMON.DBM.GetProjectBuyInfo(dr.idx);
             //var sql = "select  ((sum((case when isnull(qtybuy,0) = isnull(qtyin,0) then 1 else 0 end))*1.0) / count(*))*100 " +
@@ -854,8 +862,8 @@ namespace FPJ0000
             var drv = this.bs.Current as DataRowView;
             if (drv == null) return;
             var dr = drv.Row as dsPRJ.ProjectsRow;
-            
+
-            if(dr.jasmin < 1)
+            if (dr.jasmin < 1)
             {
                 FCOMMON.Util.MsgE($"프로젝트 정보에 자스민 TASK ID가 입력되지 않았습니다");
                 return;
@@ -950,7 +958,7 @@ namespace FPJ0000
             newdr.wuid = FCOMMON.info.Login.no;
             newdr.remark = string.Empty;
             newdr.pidx = dr.idx;
-            
+
             var f = new fHistAdd(newdr);
             if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
@@ -999,6 +1007,6 @@ namespace FPJ0000
 
         }
 
-    
+
     }
 }

SubProject/FPJ0000/Project/fProjectList.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
-        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
@@ -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
-        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
@@ -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
-        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=
@@ -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
-        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
@@ -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
-        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
@@ -192,7 +192,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
@@ -204,7 +204,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>
@@ -522,7 +522,7 @@
   <data name="button1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN
-        1AAADdQB75G6FQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMZSURBVEhLzVdd
+        0wAADdMBvdUcagAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMZSURBVEhLzVdd
         TxNBFF3/hi8+GH0xJmriq5HdzralCMKDGl/LxwMphCe+QqKBmCBB3oDAzyD8A4F+AfJATFRMoAhtUVrY
         CqXajvcss2Ep07KlEDzJSSY7d+7p3Llz51b57zHvcj0M6vpgxOuNhD2eGI2NIGMGxmF8Y+ztHGMPhHl1
         4IpyI6hpr0K6vhn1+fbX2tpyPwcGeHpoiGeGh01ijG/fW1uPyMYIu92xBZfrBdYKN5UhpGl3aVeflxoa

SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs

@@ -1,4 +1,5 @@
-using System;
+using NetOffice.OutlookApi;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -16,7 +17,7 @@ namespace FPJ0000
         public fProjectPartToPurchaseCR(int pidx, List<int> idxlist)
         {
             InitializeComponent();
-           // dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            // dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             IDXList = idxlist;
             this.ProjectIndex = pidx;
             this.KeyPreview = true;
@@ -37,7 +38,7 @@ namespace FPJ0000
         int Col_amt = -1;
         private void Dv1_CellEndEdit(object sender, DataGridViewCellEventArgs e)
         {
-            if(e.ColumnIndex == Col_Price || e.ColumnIndex == Col_Qty)
+            if (e.ColumnIndex == Col_Price || e.ColumnIndex == Col_Qty)
             {
                 var o_price = dv1.Rows[e.RowIndex].Cells[Col_Price].Value;
                 var o_qty = dv1.Rows[e.RowIndex].Cells[Col_Qty].Value;
@@ -50,8 +51,8 @@ namespace FPJ0000
                 dv1.EndEdit();
             }
 
-            
+
-            
+
             //newdr.pumprice = (decimal)item.Cells["dvc_price"].Value;
             //newdr.pumqty = (int)item.Cells["dvc_qty"].Value;
         }
@@ -66,8 +67,8 @@ namespace FPJ0000
             foreach (dsPRJ.ProjectsPartRow dr in orderdata)
             {
                 if (this.IDXList.Contains(dr.idx) == false) continue;
-                
+
-                if(dr.IsItemSidNull() || dr.ItemSid.Length != 9)
+                if (dr.IsItemSidNull() || dr.ItemSid.Length != 9)
                 {
                     emptycount += 1;
                     continue;
@@ -91,10 +92,10 @@ namespace FPJ0000
                 var supplyname = dr.ItemSupply.Trim();
             }
 
-           // this.listView1.ResumeLayout();
+            // this.listView1.ResumeLayout();
             this.dv1.AutoResizeColumns();
             showSummary();
-            if(emptycount > 0)
+            if (emptycount > 0)
             {
                 FCOMMON.Util.MsgE($"{emptycount} 개의 데이터는 SID가 없어 추가되지 않았습니다.");
             }
@@ -180,7 +181,7 @@ namespace FPJ0000
                 cn.Close();
                 cn.Dispose();
             }
-            catch (Exception ex)
+            catch (System.Exception ex)
             {
                 FCOMMON.Util.MsgE("User List Error\n\n" + ex.Message);
             }
@@ -193,7 +194,7 @@ namespace FPJ0000
 
 
             this.Show();
-            Application.DoEvents();
+            System.Windows.Forms.Application.DoEvents();
         }
 
 
@@ -218,7 +219,7 @@ namespace FPJ0000
         {
             this.Validate();
 
-            if(this.dv1.Rows.Count < 1)
+            if (this.dv1.Rows.Count < 1)
             {
                 FCOMMON.Util.MsgE("자료가 없습니다");
                 return false;
@@ -282,13 +283,11 @@ namespace FPJ0000
             //}
 
             var fProg = new FCOMMON.fProgress();
-            fProg.Title = "CR구매파트 자료 등록 중";
+            fProg.Title = "CR구매파트 자료 집계 중";
             fProg.SetProgress(0, itemCount);
             fProg.Show();
             fProg.Refresh();
 
-            // int iCnt = 0;
-
             //데이터를 넣는다
             var ta = new dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter();
             var dt = new dsPurchase.EETGW_PurchaseCRDataTable();
@@ -296,23 +295,19 @@ namespace FPJ0000
             foreach (DataGridViewRow item in dv1.Rows)
             {
                 var dr = item.Tag as dsPRJ.ProjectsPartRow;
+                var sid = dr.ItemSid.Replace(" ", "").Trim();
 
+                bool newadd = false;
+                var newdr = dt.Where(t => t.sid == sid).FirstOrDefault();
                 //insert query
-                var newdr = dt.NewEETGW_PurchaseCRRow();
+                if (newdr == null)
+                {
+                    newdr = dt.NewEETGW_PurchaseCRRow();
+                    newadd = true;
+                }
                 // newdr.asset = cbEQModel.Text.Trim();
                 //  newdr.dept = cbEQModel.Text.Trim();
                 ///newdr.manuproc = cbManuProc.Text.Trim();
-                newdr.gcode = FCOMMON.info.Login.gcode;
-                newdr.pdate = dtPdate.Value.ToShortDateString();
-                newdr.state = "---";// cmbState.Text.Trim();
-                //newdr.process = cbProcess.Text.Trim();
-                newdr.request = userNo.Trim();
-                newdr.sid = dr.ItemSid.Replace(" ", "").Trim();
-                newdr.pumname = dr.ItemName.Trim();
-                newdr.pumidx = dr.Item;
-                newdr.pumscale = dr.ItemModel;
-                newdr.pumunit = dr.ItemUnit;
-
                 var o_price = item.Cells[Col_Price].Value;
                 var o_qty = item.Cells[Col_Qty].Value;
                 decimal v_price = 0;
@@ -320,11 +315,44 @@ namespace FPJ0000
                 if (o_price != null) v_price = decimal.Parse(o_price.ToString());
                 if (o_qty != null) v_qty = int.Parse(o_qty.ToString());
 
-                newdr.pumprice = v_price;// (decimal)item.Cells[Col_Price].Value;//dr.price;
+
+                if (newadd)
+                {
+                    newdr.gcode = FCOMMON.info.Login.gcode;
+                    newdr.pdate = dtPdate.Value.ToShortDateString();
+                    newdr.state = "---";// cmbState.Text.Trim();
+                    newdr.request = userNo.Trim();
+                    newdr.sid = dr.ItemSid.Replace(" ", "").Trim();
+                    newdr.pumname = dr.ItemName.Trim();
+                    newdr.pumidx = dr.Item;
+                    newdr.pumscale = dr.ItemModel;
+                    newdr.pumunit = dr.ItemUnit;
+                    newdr.pumprice = v_price;// (decimal)item.Cells[Col_Price].Value;//dr.price;
+                    newdr.pumqty = v_qty;// (int)item.Cells[Col_Qty].Value;// dr.qty;      //SQL = SQL.Replace("{qty}", dr.qty.ToString());   //일반수량이 아닌 필요수량으로
+                    newdr.pumamt = v_price * v_qty;// (decimal)item.Cells["dvc_amt"].Value;// dr.amt;  //SQL = SQL.Replace("{amt}", dr.amt.ToString());
+                    newdr.supply = dr.ItemSupply.Trim();
+                    newdr.supplyidx = dr.ItemSupplyidx;
+                    newdr.project = tbProject.Text.Trim();
+                    newdr.projectidx = int.Parse(tbProjectIndex.Text);
+                    newdr.import = true;
+                    newdr.wuid = FCOMMON.info.Login.no;
+                    newdr.wdate = DateTime.Now;
+                    newdr.orderno = tbCr.Text.Trim();
+                    newdr.bigo = item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                    newdr.EndEdit();
+                    dt.AddEETGW_PurchaseCRRow(newdr);
+                }
+                else
+                {
+                    newdr.pumqty += v_qty;// (int)item.Cells[Col_Qty].Value;// dr.qty;      //SQL = SQL.Replace("{qty}", dr.qty.ToString());   //일반수량이 아닌 필요수량으로
+                    newdr.pumamt += v_price * v_qty;// (decimal)item.Cells["dvc_amt"].Value;// dr.amt;  //SQL = SQL.Replace("{amt}", dr.amt.ToString());
+                    newdr.bigo += "," + item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                    newdr.EndEdit();
+                }
+
                 //if (radioButton1.Checked)
                 //
-                newdr.pumqty = v_qty;// (int)item.Cells[Col_Qty].Value;// dr.qty;      //SQL = SQL.Replace("{qty}", dr.qty.ToString());   //일반수량이 아닌 필요수량으로
+
-                newdr.pumamt = v_price * v_qty;// (decimal)item.Cells["dvc_amt"].Value;// dr.amt;  //SQL = SQL.Replace("{amt}", dr.amt.ToString());
                 //}
                 //else
                 //{
@@ -332,24 +360,15 @@ namespace FPJ0000
                 //    newdr.pumqty = dr.qtybuy;
                 //    newdr.pumamt = dr.qtybuy * dr.price;
                 //}
-                newdr.supply = dr.ItemSupply.Trim();
+
-                newdr.supplyidx = dr.ItemSupplyidx;
+
-                newdr.project = tbProject.Text.Trim();
-                newdr.projectidx = int.Parse(tbProjectIndex.Text);
-                newdr.bigo = item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
-                newdr.import = true;
-                newdr.wuid = FCOMMON.info.Login.no;
-                newdr.wdate = DateTime.Now;
-                newdr.orderno = tbCr.Text.Trim();
-                newdr.EndEdit();
-                dt.AddEETGW_PurchaseCRRow(newdr);
 
                 // Console.WriteLine(SQL);
                 fProg.IncProgress();
-                ta.Update(dt);
-            }
 
-            FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 생성 되었습니다.\n\n구매등록 화면에서 내용을 확인하세요.", itemCount));
+            }
+            var addcnt = ta.Update(dt);
+            FCOMMON.Util.MsgI(string.Format("{0}/{1}건의 자료가 생성 되었습니다.\n\n구매등록 화면에서 내용을 확인하세요.", addcnt, itemCount));
             fProg.Close();
             fProg.Dispose();
 
@@ -364,14 +383,14 @@ namespace FPJ0000
             if (dlg != DialogResult.Yes) return;
 
             var rows = this.dv1.SelectedCells;
-            if(rows.Count < 1)
+            if (rows.Count < 1)
             {
                 FCOMMON.Util.MsgE("선택된 줄이 없습니다");
                 return;
             }
 
             List<int> delrows = new List<int>();
-            foreach(DataGridViewCell cel in rows)
+            foreach (DataGridViewCell cel in rows)
             {
                 if (delrows.Contains(cel.RowIndex) == false)
                     delrows.Add(cel.RowIndex);
@@ -382,7 +401,7 @@ namespace FPJ0000
                 return;
             }
 
-            foreach(var r in delrows.OrderByDescending(t=>t))
+            foreach (var r in delrows.OrderByDescending(t => t))
             {
                 this.dv1.Rows.RemoveAt(r);
             }
@@ -393,7 +412,7 @@ namespace FPJ0000
             showSummary();
         }
 
-      
+
 
         private void toolStripButton4_Click(object sender, EventArgs e)
         {
@@ -403,6 +422,6 @@ namespace FPJ0000
             DialogResult = System.Windows.Forms.DialogResult.OK;
         }
 
-     
+
     }
 }

SubProject/FPJ0000/dsPRJ.Designer.cs

@@ -23151,22 +23151,22 @@ namespace FPJ0000.dsPRJTableAdapters {
                 "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, \r\n      " +
                 "         userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, R" +
                 "eqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmi" +
-                "n = @jasmin\r\nWHERE  (idx = @Original_idx); \r\nSELECT idx, status, pdate, name, us" +
+                "n = @jasmin, \r\n               bHighlight = @bHighlight, sfi = @sfi\r\nWHERE  (idx " +
-                "ermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, us" +
+                "= @Original_idx);  \r\nSELECT idx, status, pdate, name, usermain, usersub, reqstaf" +
-                "erManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddat" +
+                "f, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, " +
-                "e, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(id" +
+                "process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, ass" +
-                "x) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description" +
+                "et, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode" +
-                ", CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(id" +
+                ", category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After," +
-                "x) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bd" +
+                " bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS" +
-                "ate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrat" +
+                " wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, champ" +
-                "e, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS na" +
+                "ionid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid," +
-                "me_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyi" +
+                " epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUser" +
-                "d) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(s" +
+                "Name(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo" +
-                "oftwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlan" +
+                ".getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_softw" +
-                "t, pno, kdate, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [stat" +
+                "are, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FR" +
-                "us] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN " +
+                "OM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN" +
-                "\'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END" +
+                " ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료" +
-                ")";
+                "\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -23228,6 +23228,8 @@ namespace FPJ0000.dsPRJTableAdapters {
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
@@ -24011,6 +24013,8 @@ WHERE  (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode =
                     global::System.Nullable<int> pno, 
                     string kdate, 
                     global::System.Nullable<int> jasmin, 
+                    global::System.Nullable<bool> bHighlight, 
+                    global::System.Nullable<double> sfi, 
                     int Original_idx, 
                     int idx) {
             if ((status == null)) {
@@ -24368,8 +24372,20 @@ WHERE  (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode =
             else {
                 this.Adapter.UpdateCommand.Parameters[59].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[60].Value = ((int)(Original_idx));
+            if ((bHighlight.HasValue == true)) {
-            this.Adapter.UpdateCommand.Parameters[61].Value = ((int)(idx));
+                this.Adapter.UpdateCommand.Parameters[60].Value = ((bool)(bHighlight.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value;
+            }
+            if ((sfi.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[61].Value = ((double)(sfi.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[61].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[62].Value = ((int)(Original_idx));
+            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)) {

SubProject/FPJ0000/dsPRJ.xsd

@@ -110,7 +110,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE Projects
 SET        status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, 
                wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, 
@@ -118,72 +118,75 @@ SET        status = @status, pdate = @pdate, name = @name, usermain = @usermain,
                orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, 
                CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, 
                qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, 
-               userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin
+               userAssembly = @userAssembly, ReqLine = @ReqLine, ReqSite = @ReqSite, ReqPackage = @ReqPackage, ReqPlant = @ReqPlant, pno = @pno, kdate = @kdate, jasmin = @jasmin, 
-WHERE  (idx = @Original_idx); 
+               bHighlight = @bHighlight, sfi = @sfi
+WHERE  (idx = @Original_idx);  
 SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Projects" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" 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="category" ColumnName="category" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="model" ColumnName="model" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="serial" ColumnName="serial" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="bdate" ColumnName="bdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bdate" ColumnName="bdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@bdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="bdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="qdate" ColumnName="qdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="qdate" ColumnName="qdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@qdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="qdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="cdate" ColumnName="cdate" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cdate" ColumnName="cdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@cdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="cdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="championid" ColumnName="championid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="championid" ColumnName="championid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@championid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="championid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="designid" ColumnName="designid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="designid" ColumnName="designid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@designid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="designid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="assemblyid" ColumnName="assemblyid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="assemblyid" ColumnName="assemblyid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@assemblyid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="assemblyid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="epanelid" ColumnName="epanelid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="epanelid" ColumnName="epanelid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@epanelid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="epanelid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="softwareid" ColumnName="softwareid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="softwareid" ColumnName="softwareid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@softwareid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="softwareid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="userAssembly" ColumnName="userAssembly" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userAssembly" ColumnName="userAssembly" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userAssembly" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userAssembly" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqLine" ColumnName="ReqLine" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqLine" ColumnName="ReqLine" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqLine" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqLine" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqSite" ColumnName="ReqSite" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqSite" ColumnName="ReqSite" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqSite" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqSite" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPackage" ColumnName="ReqPackage" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPackage" ColumnName="ReqPackage" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPackage" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPackage" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPlant" ColumnName="ReqPlant" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ReqPlant" ColumnName="ReqPlant" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ReqPlant" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ReqPlant" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="pno" ColumnName="pno" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pno" ColumnName="pno" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pno" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="kdate" ColumnName="kdate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="kdate" ColumnName="kdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@kdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="kdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="jasmin" ColumnName="jasmin" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="jasmin" ColumnName="jasmin" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@jasmin" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="jasmin" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bHighlight" ColumnName="bHighlight" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bHighlight" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bHighlight" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sfi" ColumnName="sfi" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@sfi" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="sfi" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -2876,13 +2879,13 @@ WHERE  (idx = @idx)</CommandText>
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_UserDSName="dsPRJ" msprop:Generator_DataSetName="dsPRJ">
+  <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dsPRJ" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Projects" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_TablePropName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_UserTableName="Projects" msprop:Generator_TableVarName="tableProjects">
+        <xs:element name="Projects" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_TablePropName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -2939,7 +2942,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="status" msprop:Generator_ColumnPropNameInTable="statusColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="status" msprop:Generator_UserColumnName="status" msprop:Generator_ColumnVarNameInTable="columnstatus" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -2970,7 +2973,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="level" msprop:Generator_ColumnPropNameInRow="level" msprop:Generator_ColumnPropNameInTable="levelColumn" msprop:Generator_ColumnVarNameInTable="columnlevel" msprop:Generator_UserColumnName="level" type="xs:int" minOccurs="0" />
+              <xs:element name="level" msprop:Generator_UserColumnName="level" msprop:Generator_ColumnPropNameInTable="levelColumn" msprop:Generator_ColumnPropNameInRow="level" msprop:Generator_ColumnVarNameInTable="columnlevel" type="xs:int" minOccurs="0" />
               <xs:element name="part" msprop:Generator_ColumnPropNameInTable="partColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="part" msprop:Generator_UserColumnName="part" msprop:Generator_ColumnVarNameInTable="columnpart" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3020,7 +3023,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="isdel" msprop:Generator_ColumnPropNameInRow="isdel" msprop:Generator_ColumnPropNameInTable="isdelColumn" msprop:Generator_ColumnVarNameInTable="columnisdel" msprop:Generator_UserColumnName="isdel" type="xs:boolean" minOccurs="0" />
+              <xs:element name="isdel" msprop:Generator_UserColumnName="isdel" msprop:Generator_ColumnPropNameInTable="isdelColumn" msprop:Generator_ColumnPropNameInRow="isdel" msprop:Generator_ColumnVarNameInTable="columnisdel" type="xs:boolean" minOccurs="0" />
               <xs:element name="path" msprop:Generator_ColumnPropNameInTable="pathColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="path" msprop:Generator_UserColumnName="path" msprop:Generator_ColumnVarNameInTable="columnpath" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3114,7 +3117,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ProgressPrj" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="ProgressPrj" msprop:Generator_ColumnPropNameInTable="ProgressPrjColumn" msprop:Generator_ColumnVarNameInTable="columnProgressPrj" msprop:Generator_UserColumnName="ProgressPrj" type="xs:int" minOccurs="0" />
+              <xs:element name="ProgressPrj" msdata:ReadOnly="true" msprop:Generator_UserColumnName="ProgressPrj" msprop:Generator_ColumnPropNameInTable="ProgressPrjColumn" msprop:Generator_ColumnPropNameInRow="ProgressPrj" msprop:Generator_ColumnVarNameInTable="columnProgressPrj" type="xs:int" minOccurs="0" />
               <xs:element name="wws" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="wwsColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="wws" msprop:Generator_UserColumnName="wws" msprop:Generator_ColumnVarNameInTable="columnwws" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3185,7 +3188,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="finishrate" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="finishrate" msprop:Generator_ColumnPropNameInTable="finishrateColumn" msprop:Generator_ColumnVarNameInTable="columnfinishrate" msprop:Generator_UserColumnName="finishrate" type="xs:int" minOccurs="0" />
+              <xs:element name="finishrate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="finishrate" msprop:Generator_ColumnPropNameInTable="finishrateColumn" msprop:Generator_ColumnPropNameInRow="finishrate" msprop:Generator_ColumnVarNameInTable="columnfinishrate" type="xs:int" minOccurs="0" />
               <xs:element name="designid" msprop:Generator_ColumnPropNameInTable="designidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="designid" msprop:Generator_UserColumnName="designid" msprop:Generator_ColumnVarNameInTable="columndesignid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3214,35 +3217,35 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name_champion" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="name_champion" msprop:Generator_ColumnPropNameInTable="name_championColumn" msprop:Generator_ColumnVarNameInTable="columnname_champion" msprop:Generator_UserColumnName="name_champion" minOccurs="0">
+              <xs:element name="name_champion" msdata:ReadOnly="true" msprop:Generator_UserColumnName="name_champion" msprop:Generator_ColumnPropNameInTable="name_championColumn" msprop:Generator_ColumnPropNameInRow="name_champion" msprop:Generator_ColumnVarNameInTable="columnname_champion" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name_design" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="name_design" msprop:Generator_ColumnPropNameInTable="name_designColumn" msprop:Generator_ColumnVarNameInTable="columnname_design" msprop:Generator_UserColumnName="name_design" minOccurs="0">
+              <xs:element name="name_design" msdata:ReadOnly="true" msprop:Generator_UserColumnName="name_design" msprop:Generator_ColumnPropNameInTable="name_designColumn" msprop:Generator_ColumnPropNameInRow="name_design" msprop:Generator_ColumnVarNameInTable="columnname_design" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name_assembly" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="name_assembly" msprop:Generator_ColumnPropNameInTable="name_assemblyColumn" msprop:Generator_ColumnVarNameInTable="columnname_assembly" msprop:Generator_UserColumnName="name_assembly" minOccurs="0">
+              <xs:element name="name_assembly" msdata:ReadOnly="true" msprop:Generator_UserColumnName="name_assembly" msprop:Generator_ColumnPropNameInTable="name_assemblyColumn" msprop:Generator_ColumnPropNameInRow="name_assembly" msprop:Generator_ColumnVarNameInTable="columnname_assembly" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name_epanel" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="name_epanel" msprop:Generator_ColumnPropNameInTable="name_epanelColumn" msprop:Generator_ColumnVarNameInTable="columnname_epanel" msprop:Generator_UserColumnName="name_epanel" minOccurs="0">
+              <xs:element name="name_epanel" msdata:ReadOnly="true" msprop:Generator_UserColumnName="name_epanel" msprop:Generator_ColumnPropNameInTable="name_epanelColumn" msprop:Generator_ColumnPropNameInRow="name_epanel" msprop:Generator_ColumnVarNameInTable="columnname_epanel" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name_software" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="name_software" msprop:Generator_ColumnPropNameInTable="name_softwareColumn" msprop:Generator_ColumnVarNameInTable="columnname_software" msprop:Generator_UserColumnName="name_software" minOccurs="0">
+              <xs:element name="name_software" msdata:ReadOnly="true" msprop:Generator_UserColumnName="name_software" msprop:Generator_ColumnPropNameInTable="name_softwareColumn" msprop:Generator_ColumnPropNameInRow="name_software" msprop:Generator_ColumnVarNameInTable="columnname_software" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
@@ -3294,8 +3297,8 @@ WHERE  (idx = @idx)</CommandText>
               </xs:element>
               <xs:element name="jasmin" msprop:Generator_ColumnPropNameInTable="jasminColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="jasmin" msprop:Generator_UserColumnName="jasmin" msprop:Generator_ColumnVarNameInTable="columnjasmin" type="xs:int" minOccurs="0" />
               <xs:element name="sfi" msprop:Generator_ColumnPropNameInTable="sfiColumn" msprop:nullValue="0.0" msprop:Generator_ColumnPropNameInRow="sfi" msprop:Generator_UserColumnName="sfi" msprop:Generator_ColumnVarNameInTable="columnsfi" type="xs:double" minOccurs="0" />
-              <xs:element name="chamyeo" msprop:Generator_ColumnPropNameInRow="chamyeo" msprop:Generator_ColumnPropNameInTable="chamyeoColumn" msprop:Generator_ColumnVarNameInTable="columnchamyeo" msprop:Generator_UserColumnName="chamyeo" type="xs:float" minOccurs="0" />
+              <xs:element name="chamyeo" msprop:Generator_UserColumnName="chamyeo" msprop:Generator_ColumnPropNameInTable="chamyeoColumn" msprop:Generator_ColumnPropNameInRow="chamyeo" msprop:Generator_ColumnVarNameInTable="columnchamyeo" type="xs:float" minOccurs="0" />
-              <xs:element name="name2" msprop:Generator_ColumnPropNameInRow="name2" msprop:Generator_ColumnPropNameInTable="name2Column" msprop:Generator_ColumnVarNameInTable="columnname2" msprop:Generator_UserColumnName="name2" type="xs:string" minOccurs="0" />
+              <xs:element name="name2" msprop:Generator_UserColumnName="name2" msprop:Generator_ColumnPropNameInTable="name2Column" msprop:Generator_ColumnPropNameInRow="name2" msprop:Generator_ColumnVarNameInTable="columnname2" type="xs:string" minOccurs="0" />
               <xs:element name="lasthistoryD" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="lasthistoryDColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="lasthistoryD" msprop:Generator_UserColumnName="lasthistoryD" msprop:Generator_ColumnVarNameInTable="columnlasthistoryD" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3307,10 +3310,10 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsIOMap" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_TableVarName="tableProjectsIOMap">
+        <xs:element name="ProjectsIOMap" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="Dir" msprop:Generator_ColumnPropNameInTable="DirColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Dir" msprop:Generator_UserColumnName="Dir" msprop:Generator_ColumnVarNameInTable="columnDir" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3332,15 +3335,15 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
-              <xs:element name="Project" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:Generator_ColumnVarNameInTable="columnProject" msprop:Generator_UserColumnName="Project" type="xs:int" minOccurs="0" />
+              <xs:element name="Project" msprop:Generator_UserColumnName="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_ColumnVarNameInTable="columnProject" type="xs:int" minOccurs="0" />
               <xs:element name="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_UserColumnName="Remark" msprop:Generator_ColumnVarNameInTable="columnRemark" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3351,11 +3354,11 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsMailList" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_TableVarName="tableProjectsMailList">
+        <xs:element name="ProjectsMailList" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="Project" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:Generator_ColumnVarNameInTable="columnProject" msprop:Generator_UserColumnName="Project" type="xs:int" minOccurs="0" />
+              <xs:element name="Project" msprop:Generator_UserColumnName="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_ColumnVarNameInTable="columnProject" type="xs:int" minOccurs="0" />
               <xs:element name="enable" msprop:Generator_ColumnPropNameInTable="enableColumn" msprop:nullValue="false" msprop:Generator_ColumnPropNameInRow="enable" msprop:Generator_UserColumnName="enable" msprop:Generator_ColumnVarNameInTable="columnenable" type="xs:boolean" default="true" minOccurs="0" />
               <xs:element name="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
                 <xs:simpleType>
@@ -3378,15 +3381,15 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
-              <xs:element name="div" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnVarNameInTable="columndiv" msprop:Generator_UserColumnName="div" minOccurs="0">
+              <xs:element name="div" msprop:Generator_UserColumnName="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnVarNameInTable="columndiv" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -3396,10 +3399,10 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsPart" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_TableVarName="tableProjectsPart">
+        <xs:element name="ProjectsPart" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_UserColumnName="Project" msprop:Generator_ColumnVarNameInTable="columnProject" type="xs:int" minOccurs="0" />
               <xs:element name="Item" msprop:Generator_ColumnPropNameInTable="ItemColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="Item" msprop:Generator_UserColumnName="Item" msprop:Generator_ColumnVarNameInTable="columnItem" type="xs:int" minOccurs="0" />
               <xs:element name="qty" msprop:Generator_ColumnPropNameInTable="qtyColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="qty" msprop:Generator_UserColumnName="qty" msprop:Generator_ColumnVarNameInTable="columnqty" type="xs:int" minOccurs="0" />
@@ -3420,7 +3423,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="ItemName" msprop:Generator_ColumnPropNameInTable="ItemNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemName" msprop:Generator_UserColumnName="ItemName" msprop:Generator_ColumnVarNameInTable="columnItemName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3492,7 +3495,7 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="ItemSupplyidx" msprop:Generator_ColumnPropNameInTable="ItemSupplyidxColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="ItemSupplyidx" msprop:Generator_UserColumnName="ItemSupplyidx" msprop:Generator_ColumnVarNameInTable="columnItemSupplyidx" type="xs:int" minOccurs="0" />
-              <xs:element name="no" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnVarNameInTable="columnno" msprop:Generator_UserColumnName="no" type="xs:int" minOccurs="0" />
+              <xs:element name="no" msprop:Generator_UserColumnName="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnVarNameInTable="columnno" type="xs:int" minOccurs="0" />
               <xs:element name="ItemUnit" msprop:Generator_ColumnPropNameInTable="ItemUnitColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemUnit" msprop:Generator_UserColumnName="ItemUnit" msprop:Generator_ColumnVarNameInTable="columnItemUnit" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3506,151 +3509,151 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsHistory" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_TableVarName="tableProjectsHistory">
+        <xs:element name="ProjectsHistory" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" />
-              <xs:element name="pdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="div" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnVarNameInTable="columndiv" msprop:Generator_UserColumnName="div" minOccurs="0">
+              <xs:element name="div" msprop:Generator_UserColumnName="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnVarNameInTable="columndiv" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="remark" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:Generator_ColumnVarNameInTable="columnremark" msprop:Generator_UserColumnName="remark" minOccurs="0">
+              <xs:element name="remark" msprop:Generator_UserColumnName="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_ColumnVarNameInTable="columnremark" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="mailsend" msprop:Generator_ColumnPropNameInTable="mailsendColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="mailsend" msprop:Generator_UserColumnName="mailsend" msprop:Generator_ColumnVarNameInTable="columnmailsend" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SPMaster" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_UserTableName="SPMaster" msprop:Generator_TableVarName="tableSPMaster">
+        <xs:element name="SPMaster" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="ID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_UserColumnName="ID" type="xs:int" />
+              <xs:element name="ID" msprop:Generator_UserColumnName="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnVarNameInTable="columnID" type="xs:int" />
-              <xs:element name="CtrlNo" msprop:Generator_ColumnPropNameInRow="CtrlNo" msprop:Generator_ColumnPropNameInTable="CtrlNoColumn" msprop:Generator_ColumnVarNameInTable="columnCtrlNo" msprop:Generator_UserColumnName="CtrlNo" minOccurs="0">
+              <xs:element name="CtrlNo" msprop:Generator_UserColumnName="CtrlNo" msprop:Generator_ColumnPropNameInTable="CtrlNoColumn" msprop:Generator_ColumnPropNameInRow="CtrlNo" msprop:Generator_ColumnVarNameInTable="columnCtrlNo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="SIDNo" msprop:Generator_ColumnPropNameInRow="SIDNo" msprop:Generator_ColumnPropNameInTable="SIDNoColumn" msprop:Generator_ColumnVarNameInTable="columnSIDNo" msprop:Generator_UserColumnName="SIDNo" minOccurs="0">
+              <xs:element name="SIDNo" msprop:Generator_UserColumnName="SIDNo" msprop:Generator_ColumnPropNameInTable="SIDNoColumn" msprop:Generator_ColumnPropNameInRow="SIDNo" msprop:Generator_ColumnVarNameInTable="columnSIDNo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Storage" msprop:Generator_ColumnPropNameInRow="Storage" msprop:Generator_ColumnPropNameInTable="StorageColumn" msprop:Generator_ColumnVarNameInTable="columnStorage" msprop:Generator_UserColumnName="Storage" minOccurs="0">
+              <xs:element name="Storage" msprop:Generator_UserColumnName="Storage" msprop:Generator_ColumnPropNameInTable="StorageColumn" msprop:Generator_ColumnPropNameInRow="Storage" msprop:Generator_ColumnVarNameInTable="columnStorage" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Location" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnVarNameInTable="columnLocation" msprop:Generator_UserColumnName="Location" minOccurs="0">
+              <xs:element name="Location" msprop:Generator_UserColumnName="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_ColumnVarNameInTable="columnLocation" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="UseEqmt" msprop:Generator_ColumnPropNameInRow="UseEqmt" msprop:Generator_ColumnPropNameInTable="UseEqmtColumn" msprop:Generator_ColumnVarNameInTable="columnUseEqmt" msprop:Generator_UserColumnName="UseEqmt" minOccurs="0">
+              <xs:element name="UseEqmt" msprop:Generator_UserColumnName="UseEqmt" msprop:Generator_ColumnPropNameInTable="UseEqmtColumn" msprop:Generator_ColumnPropNameInRow="UseEqmt" msprop:Generator_ColumnVarNameInTable="columnUseEqmt" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PartName" msprop:Generator_ColumnPropNameInRow="PartName" msprop:Generator_ColumnPropNameInTable="PartNameColumn" msprop:Generator_ColumnVarNameInTable="columnPartName" msprop:Generator_UserColumnName="PartName" minOccurs="0">
+              <xs:element name="PartName" msprop:Generator_UserColumnName="PartName" msprop:Generator_ColumnPropNameInTable="PartNameColumn" msprop:Generator_ColumnPropNameInRow="PartName" msprop:Generator_ColumnVarNameInTable="columnPartName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="PartNo" msprop:Generator_ColumnPropNameInRow="PartNo" msprop:Generator_ColumnPropNameInTable="PartNoColumn" msprop:Generator_ColumnVarNameInTable="columnPartNo" msprop:Generator_UserColumnName="PartNo" minOccurs="0">
+              <xs:element name="PartNo" msprop:Generator_UserColumnName="PartNo" msprop:Generator_ColumnPropNameInTable="PartNoColumn" msprop:Generator_ColumnPropNameInRow="PartNo" msprop:Generator_ColumnVarNameInTable="columnPartNo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Process" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnVarNameInTable="columnProcess" msprop:Generator_UserColumnName="Process" minOccurs="0">
+              <xs:element name="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="SupplierNo" msprop:Generator_ColumnPropNameInRow="SupplierNo" msprop:Generator_ColumnPropNameInTable="SupplierNoColumn" msprop:Generator_ColumnVarNameInTable="columnSupplierNo" msprop:Generator_UserColumnName="SupplierNo" minOccurs="0">
+              <xs:element name="SupplierNo" msprop:Generator_UserColumnName="SupplierNo" msprop:Generator_ColumnPropNameInTable="SupplierNoColumn" msprop:Generator_ColumnPropNameInRow="SupplierNo" msprop:Generator_ColumnVarNameInTable="columnSupplierNo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CurrentQty" msprop:Generator_ColumnPropNameInRow="CurrentQty" msprop:Generator_ColumnPropNameInTable="CurrentQtyColumn" msprop:Generator_ColumnVarNameInTable="columnCurrentQty" msprop:Generator_UserColumnName="CurrentQty" type="xs:decimal" minOccurs="0" />
+              <xs:element name="CurrentQty" msprop:Generator_UserColumnName="CurrentQty" msprop:Generator_ColumnPropNameInTable="CurrentQtyColumn" msprop:Generator_ColumnPropNameInRow="CurrentQty" msprop:Generator_ColumnVarNameInTable="columnCurrentQty" type="xs:decimal" minOccurs="0" />
-              <xs:element name="MHA" msprop:Generator_ColumnPropNameInRow="MHA" msprop:Generator_ColumnPropNameInTable="MHAColumn" msprop:Generator_ColumnVarNameInTable="columnMHA" msprop:Generator_UserColumnName="MHA" type="xs:decimal" minOccurs="0" />
+              <xs:element name="MHA" msprop:Generator_UserColumnName="MHA" msprop:Generator_ColumnPropNameInTable="MHAColumn" msprop:Generator_ColumnPropNameInRow="MHA" msprop:Generator_ColumnVarNameInTable="columnMHA" type="xs:decimal" minOccurs="0" />
-              <xs:element name="Division" msprop:Generator_ColumnPropNameInRow="Division" msprop:Generator_ColumnPropNameInTable="DivisionColumn" msprop:Generator_ColumnVarNameInTable="columnDivision" msprop:Generator_UserColumnName="Division" minOccurs="0">
+              <xs:element name="Division" msprop:Generator_UserColumnName="Division" msprop:Generator_ColumnPropNameInTable="DivisionColumn" msprop:Generator_ColumnPropNameInRow="Division" msprop:Generator_ColumnVarNameInTable="columnDivision" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="BadQty" msprop:Generator_ColumnPropNameInRow="BadQty" msprop:Generator_ColumnPropNameInTable="BadQtyColumn" msprop:Generator_ColumnVarNameInTable="columnBadQty" msprop:Generator_UserColumnName="BadQty" type="xs:decimal" minOccurs="0" />
+              <xs:element name="BadQty" msprop:Generator_UserColumnName="BadQty" msprop:Generator_ColumnPropNameInTable="BadQtyColumn" msprop:Generator_ColumnPropNameInRow="BadQty" msprop:Generator_ColumnVarNameInTable="columnBadQty" type="xs:decimal" minOccurs="0" />
-              <xs:element name="Price" msprop:Generator_ColumnPropNameInRow="Price" msprop:Generator_ColumnPropNameInTable="PriceColumn" msprop:Generator_ColumnVarNameInTable="columnPrice" msprop:Generator_UserColumnName="Price" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Price" msprop:Generator_UserColumnName="Price" msprop:Generator_ColumnPropNameInTable="PriceColumn" msprop:Generator_ColumnPropNameInRow="Price" msprop:Generator_ColumnVarNameInTable="columnPrice" type="xs:decimal" minOccurs="0" />
-              <xs:element name="PriceUnit" msprop:Generator_ColumnPropNameInRow="PriceUnit" msprop:Generator_ColumnPropNameInTable="PriceUnitColumn" msprop:Generator_ColumnVarNameInTable="columnPriceUnit" msprop:Generator_UserColumnName="PriceUnit" minOccurs="0">
+              <xs:element name="PriceUnit" msprop:Generator_UserColumnName="PriceUnit" msprop:Generator_ColumnPropNameInTable="PriceUnitColumn" msprop:Generator_ColumnPropNameInRow="PriceUnit" msprop:Generator_ColumnVarNameInTable="columnPriceUnit" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CostCenter" msprop:Generator_ColumnPropNameInRow="CostCenter" msprop:Generator_ColumnPropNameInTable="CostCenterColumn" msprop:Generator_ColumnVarNameInTable="columnCostCenter" msprop:Generator_UserColumnName="CostCenter" minOccurs="0">
+              <xs:element name="CostCenter" msprop:Generator_UserColumnName="CostCenter" msprop:Generator_ColumnPropNameInTable="CostCenterColumn" msprop:Generator_ColumnPropNameInRow="CostCenter" msprop:Generator_ColumnVarNameInTable="columnCostCenter" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Memo" msprop:Generator_ColumnPropNameInRow="Memo" msprop:Generator_ColumnPropNameInTable="MemoColumn" msprop:Generator_ColumnVarNameInTable="columnMemo" msprop:Generator_UserColumnName="Memo" minOccurs="0">
+              <xs:element name="Memo" msprop:Generator_UserColumnName="Memo" msprop:Generator_ColumnPropNameInTable="MemoColumn" msprop:Generator_ColumnPropNameInRow="Memo" msprop:Generator_ColumnVarNameInTable="columnMemo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EnrDate" msprop:Generator_ColumnPropNameInRow="EnrDate" msprop:Generator_ColumnPropNameInTable="EnrDateColumn" msprop:Generator_ColumnVarNameInTable="columnEnrDate" msprop:Generator_UserColumnName="EnrDate" minOccurs="0">
+              <xs:element name="EnrDate" msprop:Generator_UserColumnName="EnrDate" msprop:Generator_ColumnPropNameInTable="EnrDateColumn" msprop:Generator_ColumnPropNameInRow="EnrDate" msprop:Generator_ColumnVarNameInTable="columnEnrDate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Enrollee" msprop:Generator_ColumnPropNameInRow="Enrollee" msprop:Generator_ColumnPropNameInTable="EnrolleeColumn" msprop:Generator_ColumnVarNameInTable="columnEnrollee" msprop:Generator_UserColumnName="Enrollee" minOccurs="0">
+              <xs:element name="Enrollee" msprop:Generator_UserColumnName="Enrollee" msprop:Generator_ColumnPropNameInTable="EnrolleeColumn" msprop:Generator_ColumnPropNameInRow="Enrollee" msprop:Generator_ColumnVarNameInTable="columnEnrollee" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
@@ -3660,11 +3663,11 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_Note" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_RowClassName="EETGW_NoteRow" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_UserTableName="EETGW_Note">
+        <xs:element name="EETGW_Note" msprop:Generator_RowClassName="EETGW_NoteRow" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -3700,21 +3703,21 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="share" msprop:Generator_ColumnPropNameInTable="shareColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="share" msprop:Generator_UserColumnName="share" msprop:Generator_ColumnVarNameInTable="columnshare" type="xs:boolean" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SCTable" msprop:Generator_RowClassName="SCTableRow" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowEvArgName="SCTableRowChangeEvent" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_UserTableName="SCTable" msprop:Generator_TableVarName="tableSCTable">
+        <xs:element name="SCTable" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowEvArgName="SCTableRowChangeEvent" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowClassName="SCTableRow" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="SID" msprop:Generator_ColumnPropNameInTable="SIDColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SID" msprop:Generator_UserColumnName="SID" msprop:Generator_ColumnVarNameInTable="columnSID" type="xs:string" minOccurs="0" />
               <xs:element name="PName" msprop:Generator_ColumnPropNameInTable="PNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PName" msprop:Generator_UserColumnName="PName" msprop:Generator_ColumnVarNameInTable="columnPName" type="xs:string" minOccurs="0" />
               <xs:element name="Qty" msprop:Generator_ColumnPropNameInTable="QtyColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="Qty" msprop:Generator_UserColumnName="Qty" msprop:Generator_ColumnVarNameInTable="columnQty" type="xs:int" minOccurs="0" />
@@ -3724,18 +3727,18 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_SaveCost" msprop:Generator_RowClassName="EETGW_SaveCostRow" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_TableVarName="tableEETGW_SaveCost">
+        <xs:element name="EETGW_SaveCost" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowClassName="EETGW_SaveCostRow" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="isdel" msprop:Generator_ColumnPropNameInRow="isdel" msprop:Generator_ColumnPropNameInTable="isdelColumn" msprop:Generator_ColumnVarNameInTable="columnisdel" msprop:Generator_UserColumnName="isdel" type="xs:boolean" minOccurs="0" />
+              <xs:element name="isdel" msprop:Generator_UserColumnName="isdel" msprop:Generator_ColumnPropNameInTable="isdelColumn" msprop:Generator_ColumnPropNameInRow="isdel" msprop:Generator_ColumnVarNameInTable="columnisdel" type="xs:boolean" minOccurs="0" />
               <xs:element name="asset" msprop:Generator_ColumnPropNameInTable="assetColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="asset" msprop:Generator_UserColumnName="asset" msprop:Generator_ColumnVarNameInTable="columnasset" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3824,14 +3827,14 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="orderno" msprop:Generator_ColumnPropNameInTable="ordernoColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="orderno" msprop:Generator_UserColumnName="orderno" msprop:Generator_ColumnVarNameInTable="columnorderno" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3846,7 +3849,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="progress" msprop:Generator_ColumnPropNameInRow="progress" msprop:Generator_ColumnPropNameInTable="progressColumn" msprop:Generator_ColumnVarNameInTable="columnprogress" msprop:Generator_UserColumnName="progress" type="xs:int" minOccurs="0" />
+              <xs:element name="progress" msprop:Generator_UserColumnName="progress" msprop:Generator_ColumnPropNameInTable="progressColumn" msprop:Generator_ColumnPropNameInRow="progress" msprop:Generator_ColumnVarNameInTable="columnprogress" type="xs:int" minOccurs="0" />
               <xs:element name="category" msprop:Generator_ColumnPropNameInTable="categoryColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="category" msprop:Generator_UserColumnName="category" msprop:Generator_ColumnVarNameInTable="columncategory" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3897,7 +3900,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectPartStatus" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_RowClassName="ProjectPartStatusRow" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_UserTableName="ProjectPartStatus">
+        <xs:element name="ProjectPartStatus" msprop:Generator_RowClassName="ProjectPartStatusRow" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
@@ -3949,8 +3952,8 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="no" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnVarNameInTable="columnno" msprop:Generator_UserColumnName="no" type="xs:int" minOccurs="0" />
+              <xs:element name="no" msprop:Generator_UserColumnName="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnVarNameInTable="columnno" type="xs:int" minOccurs="0" />
               <xs:element name="Project" msprop:Generator_ColumnPropNameInTable="ProjectColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="Project" msprop:Generator_UserColumnName="Project" msprop:Generator_ColumnVarNameInTable="columnProject" type="xs:int" minOccurs="0" />
               <xs:element name="ItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_UserColumnName="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" minOccurs="0">
                 <xs:simpleType>
@@ -4051,7 +4054,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_UserColumnName="import" msprop:Generator_ColumnVarNameInTable="columnimport" type="xs:boolean" minOccurs="0" />
               <xs:element name="qtyjago" msprop:Generator_ColumnPropNameInTable="qtyjagoColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="qtyjago" msprop:Generator_UserColumnName="qtyjago" msprop:Generator_ColumnVarNameInTable="columnqtyjago" minOccurs="0">
                 <xs:simpleType>
@@ -4103,56 +4106,56 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_UserTableName="EETGW_ProjecthistoryD">
+        <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" />
-              <xs:element name="pdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+              <xs:element name="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="div" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnVarNameInTable="columndiv" msprop:Generator_UserColumnName="div" minOccurs="0">
+              <xs:element name="div" msprop:Generator_UserColumnName="div" msprop:Generator_ColumnPropNameInTable="divColumn" msprop:Generator_ColumnPropNameInRow="div" msprop:Generator_ColumnVarNameInTable="columndiv" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="remark" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:Generator_ColumnVarNameInTable="columnremark" msprop:Generator_UserColumnName="remark" minOccurs="0">
+              <xs:element name="remark" msprop:Generator_UserColumnName="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_ColumnVarNameInTable="columnremark" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="remark2" msprop:Generator_ColumnPropNameInRow="remark2" msprop:Generator_ColumnPropNameInTable="remark2Column" msprop:Generator_ColumnVarNameInTable="columnremark2" msprop:Generator_UserColumnName="remark2" minOccurs="0">
+              <xs:element name="remark2" msprop:Generator_UserColumnName="remark2" msprop:Generator_ColumnPropNameInTable="remark2Column" msprop:Generator_ColumnPropNameInRow="remark2" msprop:Generator_ColumnVarNameInTable="columnremark2" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="mailsend" msprop:Generator_ColumnPropNameInRow="mailsend" msprop:Generator_ColumnPropNameInTable="mailsendColumn" msprop:Generator_ColumnVarNameInTable="columnmailsend" msprop:Generator_UserColumnName="mailsend" type="xs:boolean" minOccurs="0" />
+              <xs:element name="mailsend" msprop:Generator_UserColumnName="mailsend" msprop:Generator_ColumnPropNameInTable="mailsendColumn" msprop:Generator_ColumnPropNameInRow="mailsend" msprop:Generator_ColumnVarNameInTable="columnmailsend" type="xs:boolean" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjectToDo" msprop:Generator_RowClassName="EETGW_ProjectToDoRow" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_TableVarName="tableEETGW_ProjectToDo">
+        <xs:element name="EETGW_ProjectToDo" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowClassName="EETGW_ProjectToDoRow" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" />
               <xs:element name="title" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="title" msprop:Generator_UserColumnName="title" msprop:Generator_ColumnVarNameInTable="columntitle" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4174,7 +4177,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="process" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:Generator_ColumnVarNameInTable="columnprocess" msprop:Generator_UserColumnName="process" type="xs:int" minOccurs="0" />
+              <xs:element name="process" msprop:Generator_UserColumnName="process" msprop:Generator_ColumnPropNameInTable="processColumn" msprop:Generator_ColumnPropNameInRow="process" msprop:Generator_ColumnVarNameInTable="columnprocess" type="xs:int" minOccurs="0" />
               <xs:element name="remark" msprop:Generator_ColumnPropNameInTable="remarkColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="remark" msprop:Generator_UserColumnName="remark" msprop:Generator_ColumnVarNameInTable="columnremark" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4189,14 +4192,14 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="sort" msprop:Generator_ColumnPropNameInTable="sortColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="sort" msprop:Generator_UserColumnName="sort" msprop:Generator_ColumnVarNameInTable="columnsort" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4214,8 +4217,8 @@ WHERE  (idx = @idx)</CommandText>
               <xs:element name="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnVarNameInTable="columnww" type="xs:int" minOccurs="0" />
               <xs:element name="sw" msprop:Generator_ColumnPropNameInTable="swColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sw" msprop:Generator_UserColumnName="sw" msprop:Generator_ColumnVarNameInTable="columnsw" type="xs:int" minOccurs="0" />
               <xs:element name="pseq" msprop:Generator_ColumnPropNameInTable="pseqColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="pseq" msprop:Generator_UserColumnName="pseq" msprop:Generator_ColumnVarNameInTable="columnpseq" type="xs:int" minOccurs="0" />
-              <xs:element name="no" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnVarNameInTable="columnno" msprop:Generator_UserColumnName="no" type="xs:int" minOccurs="0" />
+              <xs:element name="no" msprop:Generator_UserColumnName="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnVarNameInTable="columnno" type="xs:int" minOccurs="0" />
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode" minOccurs="0">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -4225,10 +4228,10 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_UserTableName="EETGW_JobReport_EBoard">
+        <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4340,23 +4343,23 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="RepairTime" msprop:Generator_ColumnPropNameInTable="RepairTimeColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="RepairTime" msprop:Generator_UserColumnName="RepairTime" msprop:Generator_ColumnVarNameInTable="columnRepairTime" type="xs:double" minOccurs="0" />
-              <xs:element name="import" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:Generator_ColumnVarNameInTable="columnimport" msprop:Generator_UserColumnName="import" type="xs:boolean" minOccurs="0" />
+              <xs:element name="import" msprop:Generator_UserColumnName="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_ColumnVarNameInTable="columnimport" type="xs:boolean" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
-              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_UserColumnName="username" minOccurs="0">
+              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ww" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_UserColumnName="ww" minOccurs="0">
+              <xs:element name="ww" msdata:ReadOnly="true" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="6" />
@@ -4416,11 +4419,11 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput">
+        <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -4434,7 +4437,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" minOccurs="0" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" minOccurs="0" />
               <xs:element name="projectName" msprop:Generator_ColumnPropNameInTable="projectNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="projectName" msprop:Generator_UserColumnName="projectName" msprop:Generator_ColumnVarNameInTable="columnprojectName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4500,15 +4503,15 @@ WHERE  (idx = @idx)</CommandText>
               </xs:element>
               <xs:element name="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_UserColumnName="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" type="xs:double" minOccurs="0" />
               <xs:element name="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_UserColumnName="ot" msprop:Generator_ColumnVarNameInTable="columnot" type="xs:double" minOccurs="0" />
-              <xs:element name="import" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:Generator_ColumnVarNameInTable="columnimport" msprop:Generator_UserColumnName="import" type="xs:boolean" minOccurs="0" />
+              <xs:element name="import" msprop:Generator_UserColumnName="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_ColumnVarNameInTable="columnimport" type="xs:boolean" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="description2" msprop:Generator_ColumnPropNameInTable="description2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="description2" msprop:Generator_UserColumnName="description2" msprop:Generator_ColumnVarNameInTable="columndescription2" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4531,14 +4534,14 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="enable" msprop:Generator_ColumnPropNameInTable="enableColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="enable" msprop:Generator_UserColumnName="enable" msprop:Generator_ColumnVarNameInTable="columnenable" type="xs:boolean" minOccurs="0" />
-              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_UserColumnName="username" minOccurs="0">
+              <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="200" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ww" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_UserColumnName="ww" minOccurs="0">
+              <xs:element name="ww" msdata:ReadOnly="true" msprop:Generator_UserColumnName="ww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="6" />
@@ -4555,20 +4558,20 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule">
+        <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode" minOccurs="0">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="project" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_UserColumnName="project" type="xs:int" minOccurs="0" />
+              <xs:element name="project" msprop:Generator_UserColumnName="project" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnVarNameInTable="columnproject" type="xs:int" minOccurs="0" />
               <xs:element name="seq" msprop:Generator_ColumnPropNameInTable="seqColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="seq" msprop:Generator_UserColumnName="seq" msprop:Generator_ColumnVarNameInTable="columnseq" type="xs:int" minOccurs="0" />
-              <xs:element name="title" msprop:Generator_ColumnPropNameInRow="title" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:Generator_ColumnVarNameInTable="columntitle" msprop:Generator_UserColumnName="title" minOccurs="0">
+              <xs:element name="title" msprop:Generator_UserColumnName="title" msprop:Generator_ColumnPropNameInTable="titleColumn" msprop:Generator_ColumnPropNameInRow="title" msprop:Generator_ColumnVarNameInTable="columntitle" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -4587,14 +4590,14 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="progress" msprop:Generator_ColumnPropNameInTable="progressColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="progress" msprop:Generator_UserColumnName="progress" msprop:Generator_ColumnVarNameInTable="columnprogress" type="xs:int" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4622,10 +4625,10 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjectReson" msprop:Generator_RowClassName="EETGW_ProjectResonRow" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_TableVarName="tableEETGW_ProjectReson">
+        <xs:element name="EETGW_ProjectReson" msprop:Generator_RowEvHandlerName="EETGW_ProjectResonRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectResonRowDeleted" msprop:Generator_RowDeletingName="EETGW_ProjectResonRowDeleting" msprop:Generator_RowEvArgName="EETGW_ProjectResonRowChangeEvent" msprop:Generator_TablePropName="EETGW_ProjectReson" msprop:Generator_RowChangedName="EETGW_ProjectResonRowChanged" msprop:Generator_UserTableName="EETGW_ProjectReson" msprop:Generator_RowChangingName="EETGW_ProjectResonRowChanging" msprop:Generator_RowClassName="EETGW_ProjectResonRow" msprop:Generator_TableClassName="EETGW_ProjectResonDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectReson">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
               <xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4633,8 +4636,8 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" />
-              <xs:element name="pseq" msprop:Generator_ColumnPropNameInRow="pseq" msprop:Generator_ColumnPropNameInTable="pseqColumn" msprop:Generator_ColumnVarNameInTable="columnpseq" msprop:Generator_UserColumnName="pseq" type="xs:int" minOccurs="0" />
+              <xs:element name="pseq" msprop:Generator_UserColumnName="pseq" msprop:Generator_ColumnPropNameInTable="pseqColumn" msprop:Generator_ColumnPropNameInRow="pseq" msprop:Generator_ColumnVarNameInTable="columnpseq" type="xs:int" minOccurs="0" />
               <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4656,22 +4659,22 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
-              <xs:element name="no" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnVarNameInTable="columnno" msprop:Generator_UserColumnName="no" type="xs:int" minOccurs="0" />
+              <xs:element name="no" msprop:Generator_UserColumnName="no" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnVarNameInTable="columnno" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUserList" msprop:Generator_RowClassName="vJobReportForUserListRow" msprop:Generator_RowEvHandlerName="vJobReportForUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserListRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserListRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserListRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUserList" msprop:Generator_RowChangedName="vJobReportForUserListRowChanged" msprop:Generator_RowChangingName="vJobReportForUserListRowChanging" msprop:Generator_TableClassName="vJobReportForUserListDataTable" msprop:Generator_UserTableName="vJobReportForUserList" msprop:Generator_TableVarName="tablevJobReportForUserList">
+        <xs:element name="vJobReportForUserList" msprop:Generator_RowEvHandlerName="vJobReportForUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserListRowDeleted" msprop:Generator_RowDeletingName="vJobReportForUserListRowDeleting" msprop:Generator_RowEvArgName="vJobReportForUserListRowChangeEvent" msprop:Generator_TablePropName="vJobReportForUserList" msprop:Generator_RowChangedName="vJobReportForUserListRowChanged" msprop:Generator_UserTableName="vJobReportForUserList" msprop:Generator_RowChangingName="vJobReportForUserListRowChanging" msprop:Generator_RowClassName="vJobReportForUserListRow" msprop:Generator_TableClassName="vJobReportForUserListDataTable" msprop:Generator_TableVarName="tablevJobReportForUserList">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="id" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_UserColumnName="id" minOccurs="0">
+              <xs:element name="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -4688,18 +4691,18 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_UserTableName="JobReport">
+        <xs:element name="JobReport" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
-              <xs:element name="pidx" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnVarNameInTable="columnpidx" msprop:Generator_UserColumnName="pidx" type="xs:int" minOccurs="0" />
+              <xs:element name="pidx" msprop:Generator_UserColumnName="pidx" msprop:Generator_ColumnPropNameInTable="pidxColumn" msprop:Generator_ColumnPropNameInRow="pidx" msprop:Generator_ColumnVarNameInTable="columnpidx" type="xs:int" minOccurs="0" />
               <xs:element name="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_UserColumnName="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4758,14 +4761,14 @@ WHERE  (idx = @idx)</CommandText>
               </xs:element>
               <xs:element name="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_UserColumnName="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" type="xs:double" minOccurs="0" />
               <xs:element name="import" msprop:Generator_ColumnPropNameInTable="importColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="import" msprop:Generator_UserColumnName="import" msprop:Generator_ColumnVarNameInTable="columnimport" type="xs:boolean" minOccurs="0" />
-              <xs:element name="wuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+              <xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
               <xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -4816,8 +4819,8 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="otStart" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnVarNameInTable="columnotStart" msprop:Generator_UserColumnName="otStart" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otStart" msprop:Generator_UserColumnName="otStart" msprop:Generator_ColumnPropNameInTable="otStartColumn" msprop:Generator_ColumnPropNameInRow="otStart" msprop:Generator_ColumnVarNameInTable="columnotStart" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="otEnd" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnVarNameInTable="columnotEnd" msprop:Generator_UserColumnName="otEnd" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="otEnd" msprop:Generator_UserColumnName="otEnd" msprop:Generator_ColumnPropNameInTable="otEndColumn" msprop:Generator_ColumnPropNameInRow="otEnd" msprop:Generator_ColumnVarNameInTable="columnotEnd" type="xs:dateTime" minOccurs="0" />
               <xs:element name="autoinput" msprop:Generator_ColumnPropNameInTable="autoinputColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="autoinput" msprop:Generator_UserColumnName="autoinput" msprop:Generator_ColumnVarNameInTable="columnautoinput" type="xs:boolean" minOccurs="0" />
               <xs:element name="kisullv" msprop:Generator_ColumnPropNameInTable="kisullvColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="kisullv" msprop:Generator_UserColumnName="kisullv" msprop:Generator_ColumnVarNameInTable="columnkisullv" minOccurs="0">
                 <xs:simpleType>
@@ -4850,7 +4853,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ottime" msprop:Generator_ColumnPropNameInRow="ottime" msprop:Generator_ColumnPropNameInTable="ottimeColumn" msprop:Generator_ColumnVarNameInTable="columnottime" msprop:Generator_UserColumnName="ottime" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ottime" msprop:Generator_UserColumnName="ottime" msprop:Generator_ColumnPropNameInTable="ottimeColumn" msprop:Generator_ColumnPropNameInRow="ottime" msprop:Generator_ColumnVarNameInTable="columnottime" type="xs:dateTime" minOccurs="0" />
               <xs:element name="WeekName" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInTable="WeekNameColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="WeekName" msprop:Generator_UserColumnName="WeekName" msprop:Generator_ColumnVarNameInTable="columnWeekName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">