신규 스케쥴 추가시 조회되지 않는 현상 수정

스케쥴 승인,1,2 기능 구현

JobReportMailService/EETGW_ProjectToDo.cs

@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     이 코드는 템플릿에서 생성되었습니다.
+//
+//     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
+//     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace JobReportMailService
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class EETGW_ProjectToDo
+    {
+        public int idx { get; set; }
+        public int pidx { get; set; }
+        public Nullable<int> pseq { get; set; }
+        public Nullable<int> sw { get; set; }
+        public Nullable<int> ww { get; set; }
+        public string sort { get; set; }
+        public string cate { get; set; }
+        public string title { get; set; }
+        public string pdate { get; set; }
+        public string edate { get; set; }
+        public Nullable<int> process { get; set; }
+        public string remark { get; set; }
+        public string remark2 { get; set; }
+        public string wuid { get; set; }
+        public System.DateTime wdate { get; set; }
+    }
+}

JobReportMailService/EETGW_ProjectsSchedule.cs

@@ -12,20 +12,23 @@ namespace JobReportMailService
     using System;
     using System.Collections.Generic;
     
-    public partial class vMailingProjectSchedule
+    public partial class EETGW_ProjectsSchedule
     {
         public int idx { get; set; }
-        public string pdate { get; set; }
+        public string gcode { get; set; }
-        public string name { get; set; }
+        public Nullable<int> project { get; set; }
-        public string userManager { get; set; }
+        public Nullable<int> no { get; set; }
         public Nullable<int> seq { get; set; }
         public string title { get; set; }
         public Nullable<int> sw { get; set; }
         public Nullable<int> ew { get; set; }
         public Nullable<int> swa { get; set; }
-        public Nullable<int> progress { get; set; }
         public Nullable<int> ewa { get; set; }
-        public Nullable<int> ww { get; set; }
+        public string uid { get; set; }
         public string memo { get; set; }
+        public Nullable<int> appoval { get; set; }
+        public Nullable<int> progress { get; set; }
+        public string wuid { get; set; }
+        public System.DateTime wdate { get; set; }
     }
 }

JobReportMailService/JobReportMailService.csproj

@@ -65,12 +65,24 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>DataSet1.xsd</DependentUpon>
     </Compile>
+    <Compile Include="EETGW_ProjectsSchedule.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
+    <Compile Include="EETGW_ProjectToDo.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
     <Compile Include="fChildBase.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="fChildBase.Designer.cs">
       <DependentUpon>fChildBase.cs</DependentUpon>
     </Compile>
+    <Compile Include="fNoScheduleDayWeek.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="fNoScheduleDayWeek.Designer.cs">
+      <DependentUpon>fNoScheduleDayWeek.cs</DependentUpon>
+    </Compile>
     <Compile Include="fSendMail.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -136,6 +148,9 @@
     </Compile>
     <Compile Include="Program_bak.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="Projects.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -150,9 +165,6 @@
     <Compile Include="vJobReportForUser.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>
-    <Compile Include="vMailingProjectSchedule.cs">
-      <DependentUpon>Model1.tt</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -199,6 +211,9 @@
     <EmbeddedResource Include="fChildBase.resx">
       <DependentUpon>fChildBase.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="fNoScheduleDayWeek.resx">
+      <DependentUpon>fNoScheduleDayWeek.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="fSendMail.resx">
       <DependentUpon>fSendMail.cs</DependentUpon>
     </EmbeddedResource>

JobReportMailService/MDIParent1.Designer.cs

@@ -77,11 +77,12 @@ namespace JobReportMailService
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.printToolStripButton = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.statusStrip = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.menuStrip.SuspendLayout();
             this.toolStrip.SuspendLayout();
             this.statusStrip.SuspendLayout();
@@ -436,6 +437,7 @@ namespace JobReportMailService
             this.toolStripSeparator1,
             this.saveToolStripButton,
             this.printToolStripButton,
+            this.toolStripButton2,
             this.toolStripSeparator2,
             this.toolStripButton1});
             this.toolStrip.Location = new System.Drawing.Point(0, 24);
@@ -485,6 +487,20 @@ namespace JobReportMailService
             this.printToolStripButton.Text = "스케쥴(주)";
             this.printToolStripButton.Click += new System.EventHandler(this.printToolStripButton_Click);
             // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Black;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(111, 22);
+            this.toolStripButton1.Text = "메일생성및전송";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+            // 
             // statusStrip
             // 
             this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -502,19 +518,14 @@ namespace JobReportMailService
             this.toolStripStatusLabel.Size = new System.Drawing.Size(31, 17);
             this.toolStripStatusLabel.Text = "상태";
             // 
-            // toolStripSeparator2
+            // toolStripButton2
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Black;
-            // 
+            this.toolStripButton2.Name = "toolStripButton2";
-            // toolStripButton1
+            this.toolStripButton2.Size = new System.Drawing.Size(107, 22);
-            // 
+            this.toolStripButton2.Text = "스케쥴없음(주)";
-            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
-            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Black;
-            this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(111, 22);
-            this.toolStripButton1.Text = "메일생성및전송";
-            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
             // 
             // MDIParent1
             // 
@@ -592,6 +603,7 @@ namespace JobReportMailService
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.ToolStripButton toolStripButton2;
     }
 }
 

JobReportMailService/MDIParent1.cs

@@ -125,5 +125,13 @@ namespace JobReportMailService
             childForm.Show();
 
         }
+
+        private void toolStripButton2_Click(object sender, EventArgs e)
+        {
+            Form childForm = new fNoScheduleDayWeek();
+            childForm.MdiParent = this;
+            //childForm.Text = "창 " + childFormNumber++;
+            childForm.Show();
+        }
     }
 }

JobReportMailService/MDIParent1.resx

@@ -358,6 +358,22 @@
         7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo
         HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg
         gg==
+</value>
+  </data>
+  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid
+        k6JhTApClhGmktrDWlKjK3OBDrLAMWJaY9MZZJbo0umWQIEFXRPQMB6ne788HFpbW322s93d3fM598X5
+        7xjtUxh0vId5dOaPMY14kL18O6zgrcePrWz8TMIbWMGgbQIlZy6DW31pu4Qts0ml0gjRETjdH0iGHC4Y
+        LONwz/hQJVITQbZSiN7qxsfPdHYzA7u8Go1jdnEZJruLLP92XWsaB5sks+4LhgvWbc5puDxeVDaocOSs
+        HBrtM9zps21KFJ1PSHnENZ9fzS0HwzHML4XRa3CglC+Dsqsfj0xjKGVEpNzUpof6/hAoyxs8MDqhf/4a
+        tyk7rt4yQtyiBb+xA+U1ChSfluLkuevo1lkhUWlRnHuMm49fIBKLk+WtJJIprMcT5E6+0uv49CUKeTuF
+        OmkXcweyjEB1zwzLq3d46nCDMr/E3b5hqHsGIGvXQdTcA8HFDvAaWnBUIEfRKQnOM+cqhdew/7goI1B2
+        D8AfCGU3C4msbcAbXMVOcEh2UBzwxW0oqZZi1+GajKC504DpuSUw7ywPe/wtmsCcfw1jszQpW7OCY7UK
+        7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo
+        HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

JobReportMailService/Model1.Context.cs

@@ -31,6 +31,8 @@ namespace JobReportMailService
         public virtual DbSet<vJobReportForUser> vJobReportForUser { get; set; }
         public virtual DbSet<HolidayLIst> HolidayLIst { get; set; }
         public virtual DbSet<MailForm> MailForm { get; set; }
-        public virtual DbSet<vMailingProjectSchedule> vMailingProjectSchedule { get; set; }
+        public virtual DbSet<EETGW_ProjectToDo> EETGW_ProjectToDo { get; set; }
+        public virtual DbSet<Projects> Projects { get; set; }
+        public virtual DbSet<EETGW_ProjectsSchedule> EETGW_ProjectsSchedule { get; set; }
     }
 }

JobReportMailService/Model1.edmx

@@ -5,6 +5,47 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="EEModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+        <EntityType Name="EETGW_ProjectsSchedule">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="gcode" Type="varchar" MaxLength="20" />
+          <Property Name="project" Type="int" />
+          <Property Name="no" Type="int" />
+          <Property Name="seq" Type="int" />
+          <Property Name="title" Type="varchar" MaxLength="100" />
+          <Property Name="sw" Type="int" />
+          <Property Name="ew" Type="int" />
+          <Property Name="swa" Type="int" />
+          <Property Name="ewa" Type="int" />
+          <Property Name="uid" Type="varchar" MaxLength="50" />
+          <Property Name="memo" Type="varchar(max)" />
+          <Property Name="appoval" Type="int" />
+          <Property Name="progress" Type="int" />
+          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
+        </EntityType>
+        <EntityType Name="EETGW_ProjectToDo">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="pidx" Type="int" Nullable="false" />
+          <Property Name="pseq" Type="int" />
+          <Property Name="sw" Type="int" />
+          <Property Name="ww" Type="int" />
+          <Property Name="sort" Type="varchar" MaxLength="2" />
+          <Property Name="cate" Type="nvarchar" MaxLength="100" />
+          <Property Name="title" Type="nvarchar" MaxLength="255" />
+          <Property Name="pdate" Type="varchar" MaxLength="10" />
+          <Property Name="edate" Type="varchar" MaxLength="10" />
+          <Property Name="process" Type="int" />
+          <Property Name="remark" Type="varchar(max)" />
+          <Property Name="remark2" Type="varchar(max)" />
+          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
+        </EntityType>
         <EntityType Name="HolidayLIst">
           <Key>
             <PropertyRef Name="idx" />
@@ -86,6 +127,62 @@
           <Property Name="exceptmail" Type="varchar(max)" />
           <Property Name="exceptmailcc" Type="varchar(max)" />
         </EntityType>
+        <EntityType Name="Projects">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="pidx" Type="int" />
+          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
+          <Property Name="isdel" Type="bit" />
+          <Property Name="category" Type="varchar" MaxLength="50" />
+          <Property Name="status" Type="varchar" MaxLength="50" />
+          <Property Name="asset" Type="varchar" MaxLength="100" />
+          <Property Name="level" Type="int" />
+          <Property Name="rev" Type="int" />
+          <Property Name="process" Type="varchar" MaxLength="50" />
+          <Property Name="part" Type="varchar" MaxLength="50" />
+          <Property Name="pdate" Type="varchar" MaxLength="10" />
+          <Property Name="name" Type="nvarchar" MaxLength="255" />
+          <Property Name="userManager" Type="varchar" MaxLength="50" />
+          <Property Name="usermain" Type="varchar" MaxLength="50" />
+          <Property Name="usersub" Type="varchar" MaxLength="50" />
+          <Property Name="userhw2" Type="varchar" MaxLength="50" />
+          <Property Name="reqstaff" Type="varchar" MaxLength="50" />
+          <Property Name="costo" Type="float" />
+          <Property Name="costn" Type="float" />
+          <Property Name="cnt" Type="int" />
+          <Property Name="remark_req" Type="varchar(max)" />
+          <Property Name="remark_ans" Type="varchar(max)" />
+          <Property Name="sdate" Type="varchar" MaxLength="50" />
+          <Property Name="ddate" Type="varchar" MaxLength="50" />
+          <Property Name="edate" Type="varchar" MaxLength="50" />
+          <Property Name="odate" Type="varchar" MaxLength="50" />
+          <Property Name="progress" Type="int" />
+          <Property Name="memo" Type="nvarchar" MaxLength="255" />
+          <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="wdate" Type="smalldatetime" Nullable="false" />
+          <Property Name="orderno" Type="varchar" MaxLength="50" />
+          <Property Name="crdue" Type="varchar" MaxLength="10" />
+          <Property Name="import" Type="bit" />
+          <Property Name="path" Type="varchar" MaxLength="300" />
+          <Property Name="userprocess" Type="nvarchar" MaxLength="100" />
+          <Property Name="CMP_Background" Type="nvarchar(max)" />
+          <Property Name="CMP_Description" Type="nvarchar(max)" />
+          <Property Name="CMP_Before" Type="nvarchar(max)" />
+          <Property Name="CMP_After" Type="nvarchar(max)" />
+          <Property Name="bCost" Type="bit" />
+          <Property Name="bFanOut" Type="bit" />
+          <Property Name="div" Type="varchar" MaxLength="2" />
+          <Property Name="EB_Site" Type="varchar" MaxLength="20" />
+          <Property Name="EB_Line" Type="varchar" MaxLength="10" />
+          <Property Name="EB_Team" Type="varchar" MaxLength="10" />
+          <Property Name="EB_Model" Type="varchar" MaxLength="100" />
+          <Property Name="EB_OutSourceName" Type="varchar" MaxLength="100" />
+          <Property Name="EB_RepairTime" Type="float" />
+          <Property Name="EB_ConstNew" Type="float" />
+          <Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
+        </EntityType>
         <!--생성 중 오류 발생:
 경고 6002: 테이블/뷰 'EE.dbo.vGroupUser'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
         <EntityType Name="vGroupUser">
@@ -131,35 +228,22 @@
           <Property Name="svalue" Type="varchar" MaxLength="255" />
           <Property Name="hrs" Type="float" />
           <Property Name="ot" Type="float" />
-          <Property Name="userProcess" Type="nvarchar" MaxLength="100" />
           <Property Name="requestpart" Type="varchar" MaxLength="50" />
           <Property Name="package" Type="varchar" MaxLength="50" />
-        </EntityType>
+          <Property Name="userProcess" Type="varchar" MaxLength="50" />
-        <!--생성 중 오류 발생:
+          <Property Name="status" Type="varchar" MaxLength="20" />
-경고 6002: 테이블/뷰 'EE.dbo.vMailingProjectSchedule'에 기본 키가 정의되지 않았습니다. 키가 유추되었고 읽기 전용 테이블/뷰로 정의되었습니다.-->
+          <Property Name="projectName" Type="nvarchar" MaxLength="255" />
-        <EntityType Name="vMailingProjectSchedule">
+          <Property Name="description" Type="nvarchar(max)" />
-          <Key>
+          <Property Name="ww" Type="varchar" MaxLength="6" />
-            <PropertyRef Name="idx" />
-          </Key>
-          <Property Name="idx" Type="int" Nullable="false" />
-          <Property Name="pdate" Type="varchar" MaxLength="10" />
-          <Property Name="name" Type="nvarchar" MaxLength="255" />
-          <Property Name="userManager" Type="varchar" MaxLength="50" />
-          <Property Name="seq" Type="int" />
-          <Property Name="title" Type="varchar" MaxLength="100" />
-          <Property Name="sw" Type="int" />
-          <Property Name="ew" Type="int" />
-          <Property Name="swa" Type="int" />
-          <Property Name="progress" Type="int" />
-          <Property Name="ewa" Type="int" />
-          <Property Name="ww" Type="int" />
-          <Property Name="memo" Type="varchar(max)" />
         </EntityType>
         <EntityContainer Name="EEModelStoreContainer">
+          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="Self.EETGW_ProjectsSchedule" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="EETGW_ProjectToDo" EntityType="Self.EETGW_ProjectToDo" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="HolidayLIst" EntityType="Self.HolidayLIst" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="JobReport" EntityType="Self.JobReport" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MailData" EntityType="Self.MailData" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MailForm" EntityType="Self.MailForm" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="Projects" EntityType="Self.Projects" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="vGroupUser" EntityType="Self.vGroupUser" store:Type="Views" store:Schema="dbo">
             <DefiningQuery>SELECT 
     [vGroupUser].[gcode] AS [gcode], 
@@ -197,28 +281,15 @@
     [vJobReportForUser].[svalue] AS [svalue], 
     [vJobReportForUser].[hrs] AS [hrs], 
     [vJobReportForUser].[ot] AS [ot], 
-    [vJobReportForUser].[userProcess] AS [userProcess], 
     [vJobReportForUser].[requestpart] AS [requestpart], 
-    [vJobReportForUser].[package] AS [package]
+    [vJobReportForUser].[package] AS [package], 
+    [vJobReportForUser].[userProcess] AS [userProcess], 
+    [vJobReportForUser].[status] AS [status], 
+    [vJobReportForUser].[projectName] AS [projectName], 
+    [vJobReportForUser].[description] AS [description], 
+    [vJobReportForUser].[ww] AS [ww]
     FROM [dbo].[vJobReportForUser] AS [vJobReportForUser]</DefiningQuery>
           </EntitySet>
-          <EntitySet Name="vMailingProjectSchedule" EntityType="Self.vMailingProjectSchedule" store:Type="Views" store:Schema="dbo">
-            <DefiningQuery>SELECT 
-    [vMailingProjectSchedule].[idx] AS [idx], 
-    [vMailingProjectSchedule].[pdate] AS [pdate], 
-    [vMailingProjectSchedule].[name] AS [name], 
-    [vMailingProjectSchedule].[userManager] AS [userManager], 
-    [vMailingProjectSchedule].[seq] AS [seq], 
-    [vMailingProjectSchedule].[title] AS [title], 
-    [vMailingProjectSchedule].[sw] AS [sw], 
-    [vMailingProjectSchedule].[ew] AS [ew], 
-    [vMailingProjectSchedule].[swa] AS [swa], 
-    [vMailingProjectSchedule].[progress] AS [progress], 
-    [vMailingProjectSchedule].[ewa] AS [ewa], 
-    [vMailingProjectSchedule].[ww] AS [ww], 
-    [vMailingProjectSchedule].[memo] AS [memo]
-    FROM [dbo].[vMailingProjectSchedule] AS [vMailingProjectSchedule]</DefiningQuery>
-          </EntitySet>
         </EntityContainer>
       </Schema></edmx:StorageModels>
     <!-- CSDL content -->
@@ -313,9 +384,13 @@
           <Property Name="svalue" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
           <Property Name="hrs" Type="Double" />
           <Property Name="ot" Type="Double" />
-          <Property Name="userProcess" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="userProcess" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="ww" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityContainer Name="EEEntities" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="JobReport" EntityType="Self.JobReport" />
@@ -324,7 +399,9 @@
           <EntitySet Name="vJobReportForUser" EntityType="Self.vJobReportForUser" />
           <EntitySet Name="HolidayLIst" EntityType="EEModel.HolidayLIst" />
           <EntitySet Name="MailForm" EntityType="EEModel.MailForm" />
-          <EntitySet Name="vMailingProjectSchedule" EntityType="EEModel.vMailingProjectSchedule" />
+          <EntitySet Name="EETGW_ProjectToDo" EntityType="EEModel.EETGW_ProjectToDo" />
+          <EntitySet Name="Projects" EntityType="EEModel.Projects" />
+          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="EEModel.EETGW_ProjectsSchedule" />
         </EntityContainer>
         <EntityType Name="HolidayLIst">
           <Key>
@@ -359,23 +436,102 @@
           <Property Name="exceptmail" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
           <Property Name="exceptmailcc" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
         </EntityType>
-        <EntityType Name="vMailingProjectSchedule">
+        <EntityType Name="EETGW_ProjectToDo">
           <Key>
             <PropertyRef Name="idx" />
           </Key>
-          <Property Name="idx" Type="Int32" Nullable="false" />
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="pidx" Type="Int32" Nullable="false" />
+          <Property Name="pseq" Type="Int32" />
+          <Property Name="sw" Type="Int32" />
+          <Property Name="ww" Type="Int32" />
+          <Property Name="sort" Type="String" MaxLength="2" FixedLength="false" Unicode="false" />
+          <Property Name="cate" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="title" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="edate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="process" Type="Int32" />
+          <Property Name="remark" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="remark2" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+        </EntityType>
+        <EntityType Name="Projects">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="pidx" Type="Int32" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="isdel" Type="Boolean" />
+          <Property Name="category" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="status" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="asset" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="level" Type="Int32" />
+          <Property Name="rev" Type="Int32" />
+          <Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="part" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
           <Property Name="name" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
           <Property Name="userManager" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="usermain" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="usersub" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="userhw2" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="reqstaff" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="costo" Type="Double" />
+          <Property Name="costn" Type="Double" />
+          <Property Name="cnt" Type="Int32" />
+          <Property Name="remark_req" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="remark_ans" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="sdate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="ddate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="edate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="odate" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="progress" Type="Int32" />
+          <Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+          <Property Name="orderno" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="crdue" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="import" Type="Boolean" />
+          <Property Name="path" Type="String" MaxLength="300" FixedLength="false" Unicode="false" />
+          <Property Name="userprocess" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="CMP_Background" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="CMP_Description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="CMP_Before" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="CMP_After" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="bCost" Type="Boolean" />
+          <Property Name="bFanOut" Type="Boolean" />
+          <Property Name="div" Type="String" MaxLength="2" FixedLength="false" Unicode="false" />
+          <Property Name="EB_Site" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="EB_Line" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="EB_Team" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="EB_Model" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="EB_OutSourceName" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="EB_RepairTime" Type="Double" />
+          <Property Name="EB_ConstNew" Type="Double" />
+          <Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+        </EntityType>
+        <EntityType Name="EETGW_ProjectsSchedule">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="gcode" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="project" Type="Int32" />
+          <Property Name="no" Type="Int32" />
           <Property Name="seq" Type="Int32" />
           <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="sw" Type="Int32" />
           <Property Name="ew" Type="Int32" />
           <Property Name="swa" Type="Int32" />
-          <Property Name="progress" Type="Int32" />
           <Property Name="ewa" Type="Int32" />
-          <Property Name="ww" Type="Int32" />
+          <Property Name="uid" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="memo" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="appoval" Type="Int32" />
+          <Property Name="progress" Type="Int32" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
         </EntityType>
       </Schema>
     </edmx:ConceptualModels>
@@ -463,6 +619,10 @@
           <EntitySetMapping Name="vJobReportForUser">
             <EntityTypeMapping TypeName="EEModel.vJobReportForUser">
               <MappingFragment StoreEntitySet="vJobReportForUser">
+                <ScalarProperty Name="ww" ColumnName="ww" />
+                <ScalarProperty Name="description" ColumnName="description" />
+                <ScalarProperty Name="projectName" ColumnName="projectName" />
+                <ScalarProperty Name="status" ColumnName="status" />
                 <ScalarProperty Name="idx" ColumnName="idx" />
                 <ScalarProperty Name="pdate" ColumnName="pdate" />
                 <ScalarProperty Name="gcode" ColumnName="gcode" />
@@ -514,21 +674,102 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="vMailingProjectSchedule">
+          <EntitySetMapping Name="EETGW_ProjectToDo">
-            <EntityTypeMapping TypeName="EEModel.vMailingProjectSchedule">
+            <EntityTypeMapping TypeName="EEModel.EETGW_ProjectToDo">
-              <MappingFragment StoreEntitySet="vMailingProjectSchedule">
+              <MappingFragment StoreEntitySet="EETGW_ProjectToDo">
-                <ScalarProperty Name="memo" ColumnName="memo" />
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="remark2" ColumnName="remark2" />
+                <ScalarProperty Name="remark" ColumnName="remark" />
+                <ScalarProperty Name="process" ColumnName="process" />
+                <ScalarProperty Name="edate" ColumnName="edate" />
+                <ScalarProperty Name="pdate" ColumnName="pdate" />
+                <ScalarProperty Name="title" ColumnName="title" />
+                <ScalarProperty Name="cate" ColumnName="cate" />
+                <ScalarProperty Name="sort" ColumnName="sort" />
                 <ScalarProperty Name="ww" ColumnName="ww" />
-                <ScalarProperty Name="ewa" ColumnName="ewa" />
+                <ScalarProperty Name="sw" ColumnName="sw" />
+                <ScalarProperty Name="pseq" ColumnName="pseq" />
+                <ScalarProperty Name="pidx" ColumnName="pidx" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Projects">
+            <EntityTypeMapping TypeName="EEModel.Projects">
+              <MappingFragment StoreEntitySet="Projects">
+                <ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
+                <ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
+                <ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
+                <ScalarProperty Name="EB_OutSourceName" ColumnName="EB_OutSourceName" />
+                <ScalarProperty Name="EB_Model" ColumnName="EB_Model" />
+                <ScalarProperty Name="EB_Team" ColumnName="EB_Team" />
+                <ScalarProperty Name="EB_Line" ColumnName="EB_Line" />
+                <ScalarProperty Name="EB_Site" ColumnName="EB_Site" />
+                <ScalarProperty Name="div" ColumnName="div" />
+                <ScalarProperty Name="bFanOut" ColumnName="bFanOut" />
+                <ScalarProperty Name="bCost" ColumnName="bCost" />
+                <ScalarProperty Name="CMP_After" ColumnName="CMP_After" />
+                <ScalarProperty Name="CMP_Before" ColumnName="CMP_Before" />
+                <ScalarProperty Name="CMP_Description" ColumnName="CMP_Description" />
+                <ScalarProperty Name="CMP_Background" ColumnName="CMP_Background" />
+                <ScalarProperty Name="userprocess" ColumnName="userprocess" />
+                <ScalarProperty Name="path" ColumnName="path" />
+                <ScalarProperty Name="import" ColumnName="import" />
+                <ScalarProperty Name="crdue" ColumnName="crdue" />
+                <ScalarProperty Name="orderno" ColumnName="orderno" />
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="memo" ColumnName="memo" />
                 <ScalarProperty Name="progress" ColumnName="progress" />
+                <ScalarProperty Name="odate" ColumnName="odate" />
+                <ScalarProperty Name="edate" ColumnName="edate" />
+                <ScalarProperty Name="ddate" ColumnName="ddate" />
+                <ScalarProperty Name="sdate" ColumnName="sdate" />
+                <ScalarProperty Name="remark_ans" ColumnName="remark_ans" />
+                <ScalarProperty Name="remark_req" ColumnName="remark_req" />
+                <ScalarProperty Name="cnt" ColumnName="cnt" />
+                <ScalarProperty Name="costn" ColumnName="costn" />
+                <ScalarProperty Name="costo" ColumnName="costo" />
+                <ScalarProperty Name="reqstaff" ColumnName="reqstaff" />
+                <ScalarProperty Name="userhw2" ColumnName="userhw2" />
+                <ScalarProperty Name="usersub" ColumnName="usersub" />
+                <ScalarProperty Name="usermain" ColumnName="usermain" />
+                <ScalarProperty Name="userManager" ColumnName="userManager" />
+                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="pdate" ColumnName="pdate" />
+                <ScalarProperty Name="part" ColumnName="part" />
+                <ScalarProperty Name="process" ColumnName="process" />
+                <ScalarProperty Name="rev" ColumnName="rev" />
+                <ScalarProperty Name="level" ColumnName="level" />
+                <ScalarProperty Name="asset" ColumnName="asset" />
+                <ScalarProperty Name="status" ColumnName="status" />
+                <ScalarProperty Name="category" ColumnName="category" />
+                <ScalarProperty Name="isdel" ColumnName="isdel" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="pidx" ColumnName="pidx" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="EETGW_ProjectsSchedule">
+            <EntityTypeMapping TypeName="EEModel.EETGW_ProjectsSchedule">
+              <MappingFragment StoreEntitySet="EETGW_ProjectsSchedule">
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="progress" ColumnName="progress" />
+                <ScalarProperty Name="appoval" ColumnName="appoval" />
+                <ScalarProperty Name="memo" ColumnName="memo" />
+                <ScalarProperty Name="uid" ColumnName="uid" />
+                <ScalarProperty Name="ewa" ColumnName="ewa" />
                 <ScalarProperty Name="swa" ColumnName="swa" />
                 <ScalarProperty Name="ew" ColumnName="ew" />
                 <ScalarProperty Name="sw" ColumnName="sw" />
                 <ScalarProperty Name="title" ColumnName="title" />
                 <ScalarProperty Name="seq" ColumnName="seq" />
-                <ScalarProperty Name="userManager" ColumnName="userManager" />
+                <ScalarProperty Name="no" ColumnName="no" />
-                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="project" ColumnName="project" />
-                <ScalarProperty Name="pdate" ColumnName="pdate" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
                 <ScalarProperty Name="idx" ColumnName="idx" />
               </MappingFragment>
             </EntityTypeMapping>

JobReportMailService/Model1.edmx.diagram

@@ -11,7 +11,9 @@
         <EntityTypeShape EntityType="EEModel.vJobReportForUser" Width="1.5" PointX="6.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="EEModel.HolidayLIst" Width="1.5" PointX="0.75" PointY="6.75" />
         <EntityTypeShape EntityType="EEModel.MailForm" Width="1.5" PointX="7.375" PointY="5.75" />
-        <EntityTypeShape EntityType="EEModel.vMailingProjectSchedule" Width="1.5" PointX="9.375" PointY="0.75" />
+        <EntityTypeShape EntityType="EEModel.EETGW_ProjectToDo" Width="2.875" PointX="10.125" PointY="5.75" />
+        <EntityTypeShape EntityType="EEModel.Projects" Width="1.5" PointX="9.75" PointY="10.75" />
+        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="9.375" PointY="0.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

JobReportMailService/Projects.cs

@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     이 코드는 템플릿에서 생성되었습니다.
+//
+//     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
+//     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace JobReportMailService
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Projects
+    {
+        public int idx { get; set; }
+        public Nullable<int> pidx { get; set; }
+        public string gcode { get; set; }
+        public Nullable<bool> isdel { get; set; }
+        public string category { get; set; }
+        public string status { get; set; }
+        public string asset { get; set; }
+        public Nullable<int> level { get; set; }
+        public Nullable<int> rev { get; set; }
+        public string process { get; set; }
+        public string part { get; set; }
+        public string pdate { get; set; }
+        public string name { get; set; }
+        public string userManager { get; set; }
+        public string usermain { get; set; }
+        public string usersub { get; set; }
+        public string userhw2 { get; set; }
+        public string reqstaff { get; set; }
+        public Nullable<double> costo { get; set; }
+        public Nullable<double> costn { get; set; }
+        public Nullable<int> cnt { get; set; }
+        public string remark_req { get; set; }
+        public string remark_ans { get; set; }
+        public string sdate { get; set; }
+        public string ddate { get; set; }
+        public string edate { get; set; }
+        public string odate { get; set; }
+        public Nullable<int> progress { get; set; }
+        public string memo { get; set; }
+        public string wuid { get; set; }
+        public System.DateTime wdate { get; set; }
+        public string orderno { get; set; }
+        public string crdue { get; set; }
+        public Nullable<bool> import { get; set; }
+        public string path { get; set; }
+        public string userprocess { get; set; }
+        public string CMP_Background { get; set; }
+        public string CMP_Description { get; set; }
+        public string CMP_Before { get; set; }
+        public string CMP_After { get; set; }
+        public Nullable<bool> bCost { get; set; }
+        public Nullable<bool> bFanOut { get; set; }
+        public string div { get; set; }
+        public string EB_Site { get; set; }
+        public string EB_Line { get; set; }
+        public string EB_Team { get; set; }
+        public string EB_Model { get; set; }
+        public string EB_OutSourceName { get; set; }
+        public Nullable<double> EB_RepairTime { get; set; }
+        public Nullable<double> EB_ConstNew { get; set; }
+        public string EB_BoardName { get; set; }
+    }
+}

JobReportMailService/Properties/AssemblyInfo.cs

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

JobReportMailService/fNoScheduleDayWeek.Designer.cs

@@ -0,0 +1,83 @@
+
+namespace JobReportMailService
+{
+    partial class fNoScheduleDayWeek
+    {
+        /// <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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fNoScheduleDayWeek));
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+            this.toolStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // timer1
+            // 
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButton1});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(473, 25);
+            this.toolStrip1.TabIndex = 2;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(48, 22);
+            this.toolStripButton1.Text = "Run";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+            // 
+            // fNoScheduleDayWeek
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(473, 416);
+            this.Controls.Add(this.toolStrip1);
+            this.Name = "fNoScheduleDayWeek";
+            this.Text = "스케쥴없음(주보고)";
+            this.Load += new System.EventHandler(this.fJobReportDay_Load);
+            this.Controls.SetChildIndex(this.toolStrip1, 0);
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+    }
+}

JobReportMailService/fNoScheduleDayWeek.cs

@@ -0,0 +1,241 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace JobReportMailService
+{
+    public partial class fNoScheduleDayWeek : fChildBase
+    {
+
+        public fNoScheduleDayWeek()
+        {
+            InitializeComponent();
+        }
+
+        private void fJobReportDay_Load(object sender, EventArgs e)
+        {
+            task = Task.Run(() =>
+            {
+                while (taskrun)
+                {
+                    if (taskwait)
+                    {
+                        if (task != null)
+                            task.Wait(1000);
+                        continue;
+                    }
+
+                    var ts = DateTime.Now - LastUpdateTime;
+                    if (ts.TotalMinutes <= 15)
+                    {
+                        if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0)
+                        {
+                            addmsg("15분 미만이라 동작하지 않습니다");
+                            ConsoleTime = DateTime.Now;
+                        }
+                    }
+                    else if (DateTime.Now.DayOfWeek != DayOfWeek.Monday)
+                    {
+                        //토,일요일에는 동작하지 않는다
+                        if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0)
+                        {
+                            addmsg("월요일에만 동작 합니다");
+                            ConsoleTime = DateTime.Now;
+                        }
+                    }
+                    else if (DateTime.Now.Hour < 10) //10시부터 동작한다
+                    {
+                        if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0)
+                        {
+                            addmsg("9시 이전에는 동작하지 않습니다");
+                            ConsoleTime = DateTime.Now;
+                        }
+                    }
+                    else
+                    {
+                        LastUpdateTime = DateTime.Now;
+                        try
+                        {
+                            RunData();
+                        }
+                        catch (Exception ex)
+                        {
+                            addmsg(ex.Message);
+                            task.Wait(5000);
+                        }
+                    }
+                    Task.Delay(Delaytime).Wait();
+                }
+
+            });
+            timer1.Start();
+        }
+
+        void RunData()
+        {
+            addmsg("스케쥴입력(주) 미 작성자 추출 작업을 시작 합니다");
+
+
+            var db = new EEEntities();
+
+            //메일양식이 지정되어있는지 체크
+            var MailJD = db.MailForm.AsNoTracking().Where(t => t.gcode == Pub.vGcode & t.cate == "SN").FirstOrDefault();
+
+            if (MailJD == null)
+            {
+                //토,일요일에는 동작하지 않는다
+                addmsg("메일 양식(SN)이 입력되지 않았습니다");
+                return;
+            }
+
+            //기준일자는 오늘부터 -15일이다
+            var sd = DateTime.Now.AddDays(-15);
+            var ed = DateTime.Now;
+            var str_sd = sd.ToShortDateString();
+            var str_ed = ed.ToShortDateString();
+            var str_dt = DateTime.Now.ToShortDateString();
+
+            //오늘날짜로  데이터가 등록되어있느지 확인한다.
+            db = new EEEntities();
+            var Existweek = db.MailData.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.cate == "SN" && t.wuid == "395552" && t.pdate == str_dt).Any();
+            if (Existweek)
+            {
+                addmsg($"스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다");
+                return;
+            }
+
+            //대상 사용자 목록을 추출한다
+            //var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter();
+            //var users = new DataSet1.vMailingProjectScheduleDataTable();
+            //ta.Fill(users);
+            db = new EEEntities();
+            var projects = db.Projects.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.status == "진행" && (t.isdel == null || t.isdel == false)).OrderBy(t => t.sdate).ToList();
+            // db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id);
+
+            addmsg($"{projects.Count} 건의 데이터가 확인 되었습니다");
+
+            //메일데이터 생성
+            var body = new System.Text.StringBuilder();
+            body.AppendLine("<table border='1' cellspacing='1' cellpadding='1'  style='text-align:center;'>");
+            body.AppendLine("<tr>");
+            body.AppendLine("<td>시작일</td>");
+            body.AppendLine("<td>상태</td>");
+            body.AppendLine("<td>번호</td>");
+            body.AppendLine("<td>Project</td>");
+            body.AppendLine("<td>요청</td>");
+            body.AppendLine("<td>Champion</td>");
+            body.AppendLine("<td>협업</td>");
+            body.AppendLine("<td>만료일</td>");
+            body.AppendLine("<td>수량</td>");
+            body.AppendLine("<td>외주금액</td>");
+            body.AppendLine("<td>자체금액</td>");
+            body.AppendLine("<td>절감액</td>");
+            body.AppendLine("<td>CR/CF</td>");
+            body.AppendLine("</tr>");
+
+            //var gp = projects.GroupBy(t => t.idx);
+            foreach (var row in projects)
+            {
+
+                //스케쥴에서 데이터를 찾는다.
+                var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.project == row.idx && t.appoval > 1).Any();
+                if (cnt == true) continue; //등록되었다
+
+                body.AppendLine($"<tr>");
+                body.AppendLine($"<td>{row.sdate}</td>");
+                body.AppendLine($"<td>{row.status}</td>");
+                body.AppendLine($"<td>{row.idx}</td>");
+                body.AppendLine($"<td>{row.name}</td>");
+                body.AppendLine($"<td>{row.reqstaff}</td>");
+                body.AppendLine($"<td>{row.userManager}</td>");
+                body.AppendLine($"<td>{row.usermain}/{row.usersub}/{row.userhw2}</td>");
+                body.AppendLine($"<td>{row.edate}</td>");
+                body.AppendLine($"<td>{row.cnt}</td>");
+                body.AppendLine($"<td>{row.costo}</td>");
+                body.AppendLine($"<td>{row.costn}</td>");
+                body.AppendLine($"<td>{row.costo - row.costn}</td>");
+                body.AppendLine($"<td>{row.orderno}</td>");
+                body.AppendLine($"</tr>");
+            }
+            body.AppendLine("</table>");
+
+            //일별경고(월요일제외)
+
+            if (MailJD != null)
+            {
+                var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id);
+                var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email);
+                var mail_cc = string.Empty; //
+                if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email);
+                var mail_bcc = string.Empty;
+                if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email);
+                var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name);
+                //mail_body = mail_body.Replace("{사번}", userinfo.id);
+
+                //메일본문을 생성해서 진행해야함
+                var mail_content = mail_body.Replace("{data}", body.ToString());
+
+                //메일데이터를 생성한다.
+                //mail_to = "chikyun.kim@amkor.co.kr";
+                //mail_bcc = string.Empty;
+                //mail_cc = string.Empty;
+
+                mail_to = Pub.MailSort(mail_to, MailJD.exceptmail);
+                if (string.IsNullOrEmpty(mail_to) == false)
+                {
+                    db = new EEEntities();
+                    db.MailData.Add(new MailData
+                    {
+                        gcode = Pub.vGcode,
+                        cate = "SN",
+                        subject = mail_subject,
+                        fromlist = "eetgw@amkor.co.kr",
+                        tolist = Pub.MailSort(mail_to, MailJD.exceptmail),
+                        bcc = mail_bcc,
+                        cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc),
+                        pdate = DateTime.Now.ToShortDateString(),
+                        body = mail_content,
+                        wuid = "395552",
+                        wdate = DateTime.Now,
+                    });
+                    db.SaveChanges();
+                    addmsg($"메일 전송 완료(no스케쥴week)");
+                    System.Threading.Thread.Sleep(10000);
+                }
+                else
+                {
+                    addmsg("받는사람이 소거되어 메일을 생성하지 않습니다");
+                }
+            }
+        }
+
+        private void toolStripButton1_Click(object sender, EventArgs e)
+        {
+            taskwait = !taskwait;
+        }
+
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            if (task != null)
+            {
+                if (task.IsCompleted) this.toolStripButton1.Text = "완료";
+                else if (task.IsCanceled) this.toolStripButton1.Text = "취소";
+                else if (taskwait) this.toolStripButton1.Text = "대기상태";
+                else this.toolStripButton1.Text = "가동중";
+                this.toolStripButton1.Enabled = true;
+            }
+            else
+            {
+                this.toolStripButton1.Text = "사용불가";
+                this.toolStripButton1.Enabled = false;
+            }
+
+        }
+    }
+}

JobReportMailService/fNoScheduleDayWeek.resx

@@ -0,0 +1,142 @@
+<?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="timer1.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>104, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+</root>

JobReportMailService/vJobReportForUser.cs

@@ -27,5 +27,9 @@ namespace JobReportMailService
         public string userProcess { get; set; }
         public string requestpart { get; set; }
         public string package { get; set; }
+        public string status { get; set; }
+        public string projectName { get; set; }
+        public string description { get; set; }
+        public string ww { get; set; }
     }
 }

Project/BaseController.cs

@@ -238,6 +238,34 @@ namespace Project
                 }
             }
 
+            agi.HtmlDocument doc = new agi.HtmlDocument();
+            doc.LoadHtml(contents);
+
+            //파일참조 태그를 모두 가져옴
+            var tags_include = doc.QuerySelectorAll("include");
+            foreach (var item in tags_include)
+            {
+                var filename = item.InnerText;
+
+                var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
+                load_file = load_file.Replace("\\\\", "\\");
+                String fileContents;// = String.Empty;
+
+                Console.WriteLine("## " + item.OuterHtml);
+                if (System.IO.File.Exists(load_file))
+                {
+                    fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
+                }
+                else
+                {
+                    fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
+                        filename);    //파일이없다면 해당 부분은 오류 처리한다.
+                }
+                contents = contents.Replace(item.OuterHtml, fileContents);
+            }
+
+
+
             //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여,  그냥 처리해본다
             while (true)
             {

Project/Controller/CustomerController.cs

@@ -8,7 +8,6 @@ namespace Project
     public class CustomerController : BaseController
     {
 
-
         // PUT api/values/5
         public void Put(int id, [FromBody] string value)
         {

Project/Controller/JobreportController.cs

@@ -1,6 +1,8 @@
-using System;
+using Microsoft.Owin;
+using System;
 using System.Linq;
 using System.Net.Http;
+using System.Web;
 using System.Web.Http;
 
 namespace Project
@@ -19,10 +21,100 @@ namespace Project
         {
         }
 
-        [HttpGet]
+        [HttpPost]
-        public string Test()
+        public string Add(FormCollection tbpdate)
         {
-            return "test";
+            var vals = Request.GetQueryNameValuePairs();
+            return string.Empty;
+        }
+
+
+        [HttpGet]
+        public HttpResponseMessage Add()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View("/jobreport/add");
+
+
+            var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+
+            var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var searchkey = string.Empty;
+            if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
+
+            var tbody = new System.Text.StringBuilder();
+
+            //테이블데이터생성
+            var itemcnt = 0;
+            //if (searchkey.isEmpty() == false)
+            {
+                var db = new EEEntitiesJobreport();
+                var sd = DateTime.Now.ToString("yyyy-MM-01");
+                var ed = DateTime.Now.ToShortDateString();
+                var rows = db.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
+                itemcnt = rows.Count();
+                foreach (var item in rows)
+                {
+                    tbody.AppendLine("<tr>");
+
+                    tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
+                    tbody.AppendLine($"<td>{item.ww}</td>");
+                    tbody.AppendLine($"<td>{item.name}</td>");
+
+                    if (item.status == "진행 중" || item.status.EndsWith("%"))
+                        tbody.AppendLine($"<td class='table-info text-center'>{item.status}</td>");
+                    else
+                        tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
+
+                    tbody.AppendLine($"<td>{item.type}</td>");
+                    tbody.AppendLine($"<td>{item.projectName}</td>");
+                    tbody.AppendLine($"<td>{item.hrs}</td>");
+                    tbody.AppendLine($"<td>{item.ot}</td>");
+
+                    tbody.AppendLine("<td><span class='d-inline-block text-truncate' style='max-width: 150px;'>");
+                    tbody.AppendLine(item.description);
+                    tbody.AppendLine("</span></td>");
+
+                    tbody.AppendLine("</tr>");
+                }
+            }
+
+            //아잍쳄이 없는경우
+            if (itemcnt == 0)
+            {
+                tbody.AppendLine("<tr>");
+                tbody.AppendLine("<th scope='row'>1</th>");
+                tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
+                tbody.AppendLine("</tr>");
+            }
+
+
+            var contents = result.Content.Replace("{search}", searchkey);
+            contents = contents.Replace("{tabledata}", tbody.ToString());
+            contents = contents.Replace("{cnt}", itemcnt.ToString());
+
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
         }
 
         [HttpGet]

Project/Dialog/fLogin.cs

@@ -153,14 +153,13 @@ namespace Project.Dialog
                 FCOMMON.info.Login.permission = 0;
                 FCOMMON.info.Login.gpermission = int.Parse(gperm);
 
-
                 using (var dbEnity = new EEEntitiesMain())
                 {
                     var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
-                    FCOMMON.info.Login.process = drGrpUser.Process;
+                    if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자":"");
+                    else FCOMMON.info.Login.process = drGrpUser.Process;
                 }
 
-
                 //로그인정보 기록
                 AddLoginInfo();
 
@@ -174,7 +173,6 @@ namespace Project.Dialog
                 Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요");
                 DialogResult = System.Windows.Forms.DialogResult.Cancel;
             }
-
         }
 
         void MakeAutoJobReport()
@@ -222,9 +220,6 @@ namespace Project.Dialog
                         "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
                 }
             }
-
-
-
         }
 
         void AddLoginInfo()
@@ -268,23 +263,6 @@ namespace Project.Dialog
                 Console.WriteLine(ex.Message);
             }
         }
-
-        private void label3_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            //var f = new Dialog.fSelectDept();
-            //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            //{
-            //    if (cmbDept.Items.Contains(f.deptName) == false)
-            //        cmbDept.Items.Add(f.deptName);
-            //    cmbDept.Text = f.deptName;
-            //}
-        }
-
         private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr");

Project/_Common/fAddNewUser.cs

@@ -168,6 +168,7 @@ namespace Project._Common
                 drUser.gcode = gcode;
                 drUser.level = 1;
                 drUser.id = tbId.Text.Trim();
+                drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0
 
                 drUser.name = tbNameK.Text.Trim();
                 drUser.nameE = tbNameE.Text.Trim();
@@ -184,6 +185,7 @@ namespace Project._Common
 
             else
             {
+                if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C";
                 drUser.name = tbNameK.Text.Trim();
                 drUser.nameE = tbNameE.Text.Trim();
                 drUser.dept = this.tbDept.Text.Trim();

SubProject/FCM0000/DSUser.Designer.cs

@@ -1214,6 +1214,10 @@ namespace FCM0000 {
             
             private global::System.Data.DataColumn columnjobreport;
             
+            private global::System.Data.DataColumn columnsavecost;
+            
+            private global::System.Data.DataColumn columnscheapp;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public AuthDataTable() {
@@ -1303,6 +1307,22 @@ namespace FCM0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn savecostColumn {
+                get {
+                    return this.columnsavecost;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn scheappColumn {
+                get {
+                    return this.columnscheapp;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1340,7 +1360,7 @@ namespace FCM0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport) {
+            public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp) {
                 AuthRow rowAuthRow = ((AuthRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -1349,7 +1369,9 @@ namespace FCM0000 {
                         purchase,
                         holyday,
                         project,
-                        jobreport};
+                        jobreport,
+                        savecost,
+                        scheapp};
                 rowAuthRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowAuthRow);
                 return rowAuthRow;
@@ -1386,6 +1408,8 @@ namespace FCM0000 {
                 this.columnholyday = base.Columns["holyday"];
                 this.columnproject = base.Columns["project"];
                 this.columnjobreport = base.Columns["jobreport"];
+                this.columnsavecost = base.Columns["savecost"];
+                this.columnscheapp = base.Columns["scheapp"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1405,6 +1429,10 @@ namespace FCM0000 {
                 base.Columns.Add(this.columnproject);
                 this.columnjobreport = new global::System.Data.DataColumn("jobreport", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnjobreport);
+                this.columnsavecost = new global::System.Data.DataColumn("savecost", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnsavecost);
+                this.columnscheapp = new global::System.Data.DataColumn("scheapp", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnscheapp);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -2264,6 +2292,38 @@ namespace FCM0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int savecost {
+                get {
+                    if (this.IssavecostNull()) {
+                        return 0;
+                    }
+                    else {
+                        return ((int)(this[this.tableAuth.savecostColumn]));
+                    }
+                }
+                set {
+                    this[this.tableAuth.savecostColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int scheapp {
+                get {
+                    if (this.IsscheappNull()) {
+                        return 0;
+                    }
+                    else {
+                        return ((int)(this[this.tableAuth.scheappColumn]));
+                    }
+                }
+                set {
+                    this[this.tableAuth.scheappColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsuserNull() {
@@ -2323,6 +2383,30 @@ namespace FCM0000 {
             public void SetjobreportNull() {
                 this[this.tableAuth.jobreportColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IssavecostNull() {
+                return this.IsNull(this.tableAuth.savecostColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetsavecostNull() {
+                this[this.tableAuth.savecostColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsscheappNull() {
+                return this.IsNull(this.tableAuth.scheappColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetscheappNull() {
+                this[this.tableAuth.scheappColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -4058,10 +4142,12 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
             tableMapping.ColumnMappings.Add("holyday", "holyday");
             tableMapping.ColumnMappings.Add("project", "project");
             tableMapping.ColumnMappings.Add("jobreport", "jobreport");
+            tableMapping.ColumnMappings.Add("savecost", "savecost");
+            tableMapping.ColumnMappings.Add("scheapp", "scheapp");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -4075,10 +4161,14 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp);
-SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]";
+SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -4086,10 +4176,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@holyday", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "holyday", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)));
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)));
-SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = @idx) ORDER BY [user]";
+SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user]";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -4097,6 +4189,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@holyday", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "holyday", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -4109,6 +4203,10 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
@@ -4125,8 +4223,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT  idx, [user], gcode, purchase, holyday, project, jobreport\r\nFROM     Auth\r" +
+            this._commandCollection[0].CommandText = "SELECT  idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche" +
-                "\nWHERE  (gcode = @gcode)\r\nORDER BY [user]";
+                "app\r\nFROM     Auth\r\nWHERE  (gcode = @gcode)\r\nORDER BY [user]";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
@@ -4200,7 +4298,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport) {
+        public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport, global::System.Nullable<int> Original_savecost, global::System.Nullable<int> Original_scheapp) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_user == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -4248,6 +4346,22 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                 this.Adapter.DeleteCommand.Parameters[10].Value = ((object)(1));
                 this.Adapter.DeleteCommand.Parameters[11].Value = global::System.DBNull.Value;
             }
+            if ((Original_savecost.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[13].Value = ((int)(Original_savecost.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            if ((Original_scheapp.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[15].Value = ((int)(Original_scheapp.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -4268,7 +4382,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport) {
+        public virtual int Insert(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport, global::System.Nullable<int> savecost, global::System.Nullable<int> scheapp) {
             if ((user == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -4305,6 +4419,18 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             else {
                 this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
+            if ((savecost.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[6].Value = ((int)(savecost.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            if ((scheapp.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[7].Value = ((int)(scheapp.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -4325,7 +4451,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport, int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport, int idx) {
+        public virtual int Update(
+                    string user, 
+                    string gcode, 
+                    global::System.Nullable<int> purchase, 
+                    global::System.Nullable<int> holyday, 
+                    global::System.Nullable<int> project, 
+                    global::System.Nullable<int> jobreport, 
+                    global::System.Nullable<int> savecost, 
+                    global::System.Nullable<int> scheapp, 
+                    int Original_idx, 
+                    string Original_user, 
+                    string Original_gcode, 
+                    global::System.Nullable<int> Original_purchase, 
+                    global::System.Nullable<int> Original_holyday, 
+                    global::System.Nullable<int> Original_project, 
+                    global::System.Nullable<int> Original_jobreport, 
+                    global::System.Nullable<int> Original_savecost, 
+                    global::System.Nullable<int> Original_scheapp, 
+                    int idx) {
             if ((user == null)) {
                 this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -4362,54 +4506,82 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             else {
                 this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_idx));
+            if ((savecost.HasValue == true)) {
-            if ((Original_user == null)) {
+                this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(savecost.Value));
-                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value;
-                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_user));
+            }
+            if ((scheapp.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(scheapp.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx));
+            if ((Original_user == null)) {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_user));
             }
             if ((Original_gcode == null)) {
                 throw new global::System.ArgumentNullException("Original_gcode");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_gcode));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode));
             }
             if ((Original_purchase.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_purchase.Value));
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
-            }
-            if ((Original_holyday.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_holyday.Value));
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_purchase.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
             }
-            if ((Original_project.HasValue == true)) {
+            if ((Original_holyday.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_project.Value));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_holyday.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
             }
-            if ((Original_jobreport.HasValue == true)) {
+            if ((Original_project.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_jobreport.Value));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(idx));
+            if ((Original_jobreport.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_jobreport.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
+            }
+            if ((Original_savecost.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_savecost.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
+            }
+            if ((Original_scheapp.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_scheapp.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[24].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)) {
@@ -4430,8 +4602,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string user, string gcode, global::System.Nullable<int> purchase, global::System.Nullable<int> holyday, global::System.Nullable<int> project, global::System.Nullable<int> jobreport, int Original_idx, string Original_user, string Original_gcode, global::System.Nullable<int> Original_purchase, global::System.Nullable<int> Original_holyday, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_jobreport) {
+        public virtual int Update(
-            return this.Update(user, gcode, purchase, holyday, project, jobreport, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_idx);
+                    string user, 
+                    string gcode, 
+                    global::System.Nullable<int> purchase, 
+                    global::System.Nullable<int> holyday, 
+                    global::System.Nullable<int> project, 
+                    global::System.Nullable<int> jobreport, 
+                    global::System.Nullable<int> savecost, 
+                    global::System.Nullable<int> scheapp, 
+                    int Original_idx, 
+                    string Original_user, 
+                    string Original_gcode, 
+                    global::System.Nullable<int> Original_purchase, 
+                    global::System.Nullable<int> Original_holyday, 
+                    global::System.Nullable<int> Original_project, 
+                    global::System.Nullable<int> Original_jobreport, 
+                    global::System.Nullable<int> Original_savecost, 
+                    global::System.Nullable<int> Original_scheapp) {
+            return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_idx);
         }
     }
     

SubProject/FCM0000/DSUser.xsd

@@ -251,10 +251,10 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AuthTableAdapter" GeneratorDataComponentClassName="AuthTableAdapter" Name="Auth" UserDataComponentName="AuthTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.Auth" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Auth" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)))</CommandText>
+                    <CommandText>DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_user" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -268,13 +268,17 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport);
+                    <CommandText>INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp);
-SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]</CommandText>
+SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -282,24 +286,26 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@holyday" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="holyday" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, [user], gcode, purchase, holyday, project, jobreport
+                    <CommandText>SELECT  idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp
 FROM     Auth
 WHERE  (gcode = @gcode)
 ORDER BY [user]</CommandText>
                     <Parameters>
-                      <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.Auth" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)));
+                    <CommandText>UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)));
-SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = @idx) ORDER BY [user]</CommandText>
+SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user]</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -307,6 +313,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@holyday" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="holyday" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_user" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_user" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="user" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -319,7 +327,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_jobreport" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="jobreport" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_savecost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="savecost" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_scheapp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="scheapp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Auth" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -333,6 +345,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
               <Mapping SourceColumn="holyday" DataSetColumn="holyday" />
               <Mapping SourceColumn="project" DataSetColumn="project" />
               <Mapping SourceColumn="jobreport" DataSetColumn="jobreport" />
+              <Mapping SourceColumn="savecost" DataSetColumn="savecost" />
+              <Mapping SourceColumn="scheapp" DataSetColumn="scheapp" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -344,7 +358,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
   <xs:element name="DSUser" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSUser" msprop:Generator_UserDSName="DSUser">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_RowClassName="UserGroupRow">
+        <xs:element name="UserGroup" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_RowClassName="UserGroupRow" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
@@ -354,25 +368,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
+              <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="path_kj" msprop:Generator_ColumnVarNameInTable="columnpath_kj" msprop:Generator_ColumnPropNameInRow="path_kj" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="path_kjColumn" msprop:Generator_UserColumnName="path_kj" minOccurs="0">
+              <xs:element name="path_kj" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="path_kj" msprop:Generator_ColumnVarNameInTable="columnpath_kj" msprop:Generator_ColumnPropNameInTable="path_kjColumn" msprop:Generator_UserColumnName="path_kj" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="permission" msprop:Generator_ColumnVarNameInTable="columnpermission" msprop:Generator_ColumnPropNameInRow="permission" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="permissionColumn" msprop:Generator_UserColumnName="permission" type="xs:int" minOccurs="0" />
+              <xs:element name="permission" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="permission" msprop:Generator_ColumnVarNameInTable="columnpermission" msprop:Generator_ColumnPropNameInTable="permissionColumn" msprop:Generator_UserColumnName="permission" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
+        <xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -382,113 +396,113 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="password" msprop:Generator_ColumnVarNameInTable="columnpassword" msprop:Generator_ColumnPropNameInRow="password" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="passwordColumn" msprop:Generator_UserColumnName="password" minOccurs="0">
+              <xs:element name="password" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="password" msprop:Generator_ColumnVarNameInTable="columnpassword" msprop:Generator_ColumnPropNameInTable="passwordColumn" msprop:Generator_UserColumnName="password" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="nameE" msprop:Generator_ColumnVarNameInTable="columnnameE" msprop:Generator_ColumnPropNameInRow="nameE" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="nameEColumn" msprop:Generator_UserColumnName="nameE" minOccurs="0">
+              <xs:element name="nameE" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="nameE" msprop:Generator_ColumnVarNameInTable="columnnameE" msprop:Generator_ColumnPropNameInTable="nameEColumn" msprop:Generator_UserColumnName="nameE" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
+              <xs:element name="name" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept" minOccurs="0">
+              <xs:element name="dept" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="grade" msprop:Generator_ColumnVarNameInTable="columngrade" msprop:Generator_ColumnPropNameInRow="grade" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:Generator_UserColumnName="grade" minOccurs="0">
+              <xs:element name="grade" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="grade" msprop:Generator_ColumnVarNameInTable="columngrade" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:Generator_UserColumnName="grade" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="emailColumn" msprop:Generator_UserColumnName="email" minOccurs="0">
+              <xs:element name="email" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInTable="emailColumn" msprop:Generator_UserColumnName="email" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="level" msprop:Generator_ColumnVarNameInTable="columnlevel" msprop:Generator_ColumnPropNameInRow="level" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="levelColumn" msprop:Generator_UserColumnName="level" type="xs:short" minOccurs="0" />
+              <xs:element name="level" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="level" msprop:Generator_ColumnVarNameInTable="columnlevel" msprop:Generator_ColumnPropNameInTable="levelColumn" msprop:Generator_UserColumnName="level" type="xs:short" minOccurs="0" />
-              <xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
+              <xs:element name="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
+              <xs:element name="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="tel" msprop:Generator_ColumnVarNameInTable="columntel" msprop:Generator_ColumnPropNameInRow="tel" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="telColumn" msprop:Generator_UserColumnName="tel" minOccurs="0">
+              <xs:element name="tel" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="tel" msprop:Generator_ColumnVarNameInTable="columntel" msprop:Generator_ColumnPropNameInTable="telColumn" msprop:Generator_UserColumnName="tel" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="hp" msprop:Generator_ColumnVarNameInTable="columnhp" msprop:Generator_ColumnPropNameInRow="hp" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="hpColumn" msprop:Generator_UserColumnName="hp" minOccurs="0">
+              <xs:element name="hp" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="hp" msprop:Generator_ColumnVarNameInTable="columnhp" msprop:Generator_ColumnPropNameInTable="hpColumn" msprop:Generator_UserColumnName="hp" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInRow="place" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
+              <xs:element name="place" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ads_employNo" msprop:Generator_ColumnVarNameInTable="columnads_employNo" msprop:Generator_ColumnPropNameInRow="ads_employNo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="ads_employNoColumn" msprop:Generator_UserColumnName="ads_employNo" minOccurs="0">
+              <xs:element name="ads_employNo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ads_employNo" msprop:Generator_ColumnVarNameInTable="columnads_employNo" msprop:Generator_ColumnPropNameInTable="ads_employNoColumn" msprop:Generator_UserColumnName="ads_employNo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ads_title" msprop:Generator_ColumnVarNameInTable="columnads_title" msprop:Generator_ColumnPropNameInRow="ads_title" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="ads_titleColumn" msprop:Generator_UserColumnName="ads_title" minOccurs="0">
+              <xs:element name="ads_title" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ads_title" msprop:Generator_ColumnVarNameInTable="columnads_title" msprop:Generator_ColumnPropNameInTable="ads_titleColumn" msprop:Generator_UserColumnName="ads_title" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="ads_created" msprop:Generator_ColumnVarNameInTable="columnads_created" msprop:Generator_ColumnPropNameInRow="ads_created" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="ads_createdColumn" msprop:Generator_UserColumnName="ads_created" minOccurs="0">
+              <xs:element name="ads_created" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ads_created" msprop:Generator_ColumnVarNameInTable="columnads_created" msprop:Generator_ColumnPropNameInTable="ads_createdColumn" msprop:Generator_UserColumnName="ads_created" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInRow="memo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
+              <xs:element name="memo" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="255" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
+              <xs:element name="wuid" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -499,28 +513,30 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Auth" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth" msprop:Generator_TablePropName="Auth" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_UserTableName="Auth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_RowEvArgName="AuthRowChangeEvent" msprop:Generator_RowClassName="AuthRow">
+        <xs:element name="Auth" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_TablePropName="Auth" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_RowClassName="AuthRow" msprop:Generator_UserTableName="Auth" msprop:Generator_RowEvArgName="AuthRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
-              <xs:element name="user" msprop:Generator_ColumnVarNameInTable="columnuser" msprop:Generator_ColumnPropNameInRow="user" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="userColumn" msprop:Generator_UserColumnName="user" minOccurs="0">
+              <xs:element name="user" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="user" msprop:Generator_ColumnVarNameInTable="columnuser" msprop:Generator_ColumnPropNameInTable="userColumn" msprop:Generator_UserColumnName="user" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
+              <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="purchase" msprop:Generator_ColumnVarNameInTable="columnpurchase" msprop:Generator_ColumnPropNameInRow="purchase" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="purchaseColumn" msprop:Generator_UserColumnName="purchase" type="xs:int" minOccurs="0" />
+              <xs:element name="purchase" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="purchase" msprop:Generator_ColumnVarNameInTable="columnpurchase" msprop:Generator_ColumnPropNameInTable="purchaseColumn" msprop:Generator_UserColumnName="purchase" type="xs:int" minOccurs="0" />
-              <xs:element name="holyday" msprop:Generator_ColumnVarNameInTable="columnholyday" msprop:Generator_ColumnPropNameInRow="holyday" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="holydayColumn" msprop:Generator_UserColumnName="holyday" type="xs:int" minOccurs="0" />
+              <xs:element name="holyday" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="holyday" msprop:Generator_ColumnVarNameInTable="columnholyday" msprop:Generator_ColumnPropNameInTable="holydayColumn" msprop:Generator_UserColumnName="holyday" type="xs:int" minOccurs="0" />
-              <xs:element name="project" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_ColumnPropNameInRow="project" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_UserColumnName="project" type="xs:int" minOccurs="0" />
+              <xs:element name="project" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="project" msprop:Generator_ColumnVarNameInTable="columnproject" msprop:Generator_ColumnPropNameInTable="projectColumn" msprop:Generator_UserColumnName="project" type="xs:int" minOccurs="0" />
-              <xs:element name="jobreport" msprop:Generator_ColumnVarNameInTable="columnjobreport" msprop:Generator_ColumnPropNameInRow="jobreport" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="jobreportColumn" msprop:Generator_UserColumnName="jobreport" type="xs:int" minOccurs="0" />
+              <xs:element name="jobreport" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jobreport" msprop:Generator_ColumnVarNameInTable="columnjobreport" msprop:Generator_ColumnPropNameInTable="jobreportColumn" msprop:Generator_UserColumnName="jobreport" type="xs:int" minOccurs="0" />
+              <xs:element name="savecost" msprop:Generator_ColumnVarNameInTable="columnsavecost" msprop:Generator_ColumnPropNameInRow="savecost" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="savecostColumn" msprop:Generator_UserColumnName="savecost" type="xs:int" minOccurs="0" />
+              <xs:element name="scheapp" msprop:Generator_ColumnVarNameInTable="columnscheapp" msprop:Generator_ColumnPropNameInRow="scheapp" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="scheappColumn" msprop:Generator_UserColumnName="scheapp" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FCM0000/User/fUserAuth.Designer.cs

@@ -30,16 +30,19 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserAuth));
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
             FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
             this.dSUser = new FCM0000.DSUser();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
@@ -60,15 +63,14 @@
             this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.ta = new FCM0000.DSUserTableAdapters.AuthTableAdapter();
             this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
+            this.ta = new FCM0000.DSUserTableAdapters.AuthTableAdapter();
             ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             this.cm1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -101,14 +103,14 @@
             this.toolStripLabel2,
             this.tbFind,
             this.btFind});
-            this.bn.Location = new System.Drawing.Point(0, 623);
+            this.bn.Location = new System.Drawing.Point(0, 601);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
             this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
             this.bn.Name = "bn";
             this.bn.PositionItem = this.bindingNavigatorPositionItem;
-            this.bn.Size = new System.Drawing.Size(652, 25);
+            this.bn.Size = new System.Drawing.Size(736, 25);
             this.bn.TabIndex = 0;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -120,6 +122,11 @@
             this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(67, 22);
             this.bindingNavigatorAddNewItem.Text = "추가(&A)";
             // 
+            // bs
+            // 
+            this.bs.DataMember = "Auth";
+            this.bs.DataSource = this.dSUser;
+            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -274,25 +281,16 @@
             this.fpSpread1.Name = "fpSpread1";
             this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(652, 623);
+            this.fpSpread1.Size = new System.Drawing.Size(736, 601);
             this.fpSpread1.TabIndex = 2;
             // 
-            // bs
-            // 
-            this.bs.DataMember = "Auth";
-            this.bs.DataSource = this.dSUser;
-            // 
-            // ta
-            // 
-            this.ta.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 = 7;
+            this.fpSpread1_Sheet1.ColumnCount = 9;
             this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
             this.fpSpread1_Sheet1.ActiveRowIndex = -1;
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사용자 번호";
@@ -301,76 +299,92 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "프로젝트";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무일지";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F;
-            numberCellType11.DecimalPlaces = 0;
+            numberCellType8.DecimalPlaces = 0;
-            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType11.MaximumValue = 2147483647D;
+            numberCellType8.MaximumValue = 2147483647D;
-            numberCellType11.MinimumValue = -2147483648D;
+            numberCellType8.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
             this.fpSpread1_Sheet1.Columns.Get(0).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType3;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "user";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Label = "사용자 번호";
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType4;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "gcode";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Visible = false;
             this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F;
-            numberCellType12.DecimalPlaces = 0;
+            numberCellType9.DecimalPlaces = 0;
-            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType12.MaximumValue = 2147483647D;
+            numberCellType9.MaximumValue = 2147483647D;
-            numberCellType12.MinimumValue = -2147483648D;
+            numberCellType9.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "purchase";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "구매관리";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F;
-            numberCellType13.DecimalPlaces = 0;
+            numberCellType10.DecimalPlaces = 0;
-            numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType13.MaximumValue = 2147483647D;
+            numberCellType10.MaximumValue = 2147483647D;
-            numberCellType13.MinimumValue = -2147483648D;
+            numberCellType10.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "holyday";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "근태관리";
             this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F;
-            numberCellType14.DecimalPlaces = 0;
+            numberCellType11.DecimalPlaces = 0;
-            numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType14.MaximumValue = 2147483647D;
+            numberCellType11.MaximumValue = 2147483647D;
-            numberCellType14.MinimumValue = -2147483648D;
+            numberCellType11.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType11;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "project";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "프로젝트";
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F;
-            numberCellType15.DecimalPlaces = 0;
+            numberCellType12.DecimalPlaces = 0;
-            numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType15.MaximumValue = 2147483647D;
+            numberCellType12.MaximumValue = 2147483647D;
-            numberCellType15.MinimumValue = -2147483648D;
+            numberCellType12.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType12;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "jobreport";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무일지";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Width = 77F;
+            numberCellType13.DecimalPlaces = 0;
+            numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType13.MaximumValue = 2147483647D;
+            numberCellType13.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "savecost";
+            numberCellType14.DecimalPlaces = 0;
+            numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType14.MaximumValue = 2147483647D;
+            numberCellType14.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "scheapp";
             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;
             // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
             // fUserAuth
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(652, 648);
+            this.ClientSize = new System.Drawing.Size(736, 626);
             this.ContextMenuStrip = this.cm1;
             this.Controls.Add(this.fpSpread1);
             this.Controls.Add(this.bn);
@@ -386,9 +400,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             this.cm1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

SubProject/FCM0000/User/fUserAuth.cs

@@ -110,7 +110,7 @@ namespace FCM0000
         {
             var drv = this.bs.Current as DataRowView;
             if (drv == null) return;
-            var dr = drv.Row as DSUser.UserGroupRow;
+            var dr = drv.Row as DSUser.AuthRow;
             if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) this.bs.RemoveCurrent();
 
             var dlg =FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?");

SubProject/FPJ0000/Auth.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     이 코드는 템플릿에서 생성되었습니다.
+//
+//     이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
+//     이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FPJ0000
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Auth
+    {
+        public int idx { get; set; }
+        public string user { get; set; }
+        public string gcode { get; set; }
+        public Nullable<int> purchase { get; set; }
+        public Nullable<int> holyday { get; set; }
+        public Nullable<int> project { get; set; }
+        public Nullable<int> jobreport { get; set; }
+        public Nullable<int> savecost { get; set; }
+        public Nullable<int> scheapp { get; set; }
+    }
+}

SubProject/FPJ0000/EETGW_ProjectsSchedule.cs

@@ -17,16 +17,18 @@ namespace FPJ0000
         public int idx { get; set; }
         public string gcode { get; set; }
         public Nullable<int> project { get; set; }
+        public Nullable<int> no { get; set; }
         public Nullable<int> seq { get; set; }
         public string title { get; set; }
         public Nullable<int> sw { get; set; }
         public Nullable<int> ew { get; set; }
         public Nullable<int> swa { get; set; }
         public Nullable<int> ewa { get; set; }
+        public string uid { get; set; }
         public string memo { get; set; }
+        public Nullable<int> appoval { get; set; }
+        public Nullable<int> progress { get; set; }
         public string wuid { get; set; }
         public System.DateTime wdate { get; set; }
-        public string uid { get; set; }
-        public Nullable<int> progress { get; set; }
     }
 }

SubProject/FPJ0000/FPJ0000.csproj

@@ -139,6 +139,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Auth.cs">
+      <DependentUpon>Model1.tt</DependentUpon>
+    </Compile>
     <Compile Include="Common.cs">
       <DependentUpon>Model1.tt</DependentUpon>
     </Compile>

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -338,12 +338,12 @@ namespace FPJ0000.JobReport_
                 var hrs = float.Parse(tbHrs.Text);
                 if (hrs > 0)
                 {
-                    FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n근무시간은 OT에 입력하시기 바랍니다.");
+                    FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n OT에 해당하면 수정하시기 바랍니다.");
                     //tbOt.Text = tbHrs.Text;
-                    dr.hrs = 0;
+                    //dr.hrs = 0;
-                    tbHrs.Text = "0";
+                    //tbHrs.Text = "0";
-                    tbHrs.Focus();
+                    //tbHrs.Focus();
-                    return;
+                    //return;
                 }
             }
 
@@ -438,19 +438,19 @@ namespace FPJ0000.JobReport_
             if (tbHrs.Text == "") tbHrs.Text = "0";
             if (tbOt.Text == "") tbOt.Text = "0";
             float hrs = float.Parse(tbHrs.Text);
-            if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday)
+            //if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday)
-            {
+            //{
-                tbHrs.Enabled = false;
+            //    tbHrs.Enabled = false;
-                if (hrs != 0)
+            //    if (hrs != 0)
-                {
+            //    {
-                    FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다.");
+            //        FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다.");
-                    dr.hrs = 0;
+            //        dr.hrs = 0;
-                    tbHrs.Text = "0";
+            //        tbHrs.Text = "0";
-                    if (hrs != 8) tbOt.Text = hrs.ToString();
+            //        if (hrs != 8) tbOt.Text = hrs.ToString();
-                    tbOt.Focus();
+            //        tbOt.Focus();
-                }
+            //    }
-            }
+            //}
-            else tbHrs.Enabled = true;
+            //else tbHrs.Enabled = true;
         }
         void UpdateWOrkTime()
         {

SubProject/FPJ0000/Model1.Context.cs

@@ -38,8 +38,9 @@ namespace FPJ0000
         public virtual DbSet<Purchase> Purchase { get; set; }
         public virtual DbSet<EETGW_Note> EETGW_Note { get; set; }
         public virtual DbSet<JobReport> JobReport { get; set; }
-        public virtual DbSet<EETGW_ProjectsSchedule> EETGW_ProjectsSchedule { get; set; }
         public virtual DbSet<vGroupUser> vGroupUser { get; set; }
         public virtual DbSet<vJobReportForUser> vJobReportForUser { get; set; }
+        public virtual DbSet<EETGW_ProjectsSchedule> EETGW_ProjectsSchedule { get; set; }
+        public virtual DbSet<Auth> Auth { get; set; }
     }
 }

SubProject/FPJ0000/Model1.edmx

@@ -5,6 +5,20 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="EEModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2008" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+        <EntityType Name="Auth">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="user" Type="varchar" MaxLength="20" />
+          <Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
+          <Property Name="purchase" Type="int" />
+          <Property Name="holyday" Type="int" />
+          <Property Name="project" Type="int" />
+          <Property Name="jobreport" Type="int" />
+          <Property Name="savecost" Type="int" />
+          <Property Name="scheapp" Type="int" />
+        </EntityType>
         <EntityType Name="Common">
           <Key>
             <PropertyRef Name="idx" />
@@ -81,6 +95,7 @@
           <Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="gcode" Type="varchar" MaxLength="20" />
           <Property Name="project" Type="int" />
+          <Property Name="no" Type="int" />
           <Property Name="seq" Type="int" />
           <Property Name="title" Type="varchar" MaxLength="100" />
           <Property Name="sw" Type="int" />
@@ -89,6 +104,7 @@
           <Property Name="ewa" Type="int" />
           <Property Name="uid" Type="varchar" MaxLength="50" />
           <Property Name="memo" Type="varchar(max)" />
+          <Property Name="appoval" Type="int" />
           <Property Name="progress" Type="int" />
           <Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
           <Property Name="wdate" Type="smalldatetime" Nullable="false" />
@@ -375,6 +391,7 @@
           <Property Name="UserProcess" Type="varchar" MaxLength="50" />
         </EntityType>
         <EntityContainer Name="EEModelStoreContainer">
+          <EntitySet Name="Auth" EntityType="Self.Auth" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Common" EntityType="Self.Common" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EETGW_JobReport_EBoard" EntityType="Self.EETGW_JobReport_EBoard" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="EETGW_Note" EntityType="Self.EETGW_Note" Schema="dbo" store:Type="Tables" />
@@ -559,9 +576,10 @@
           <EntitySet Name="Purchase" EntityType="EEModel.Purchase" />
           <EntitySet Name="EETGW_Note" EntityType="EEModel.EETGW_Note" />
           <EntitySet Name="JobReport" EntityType="EEModel.JobReport" />
-          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="EEModel.EETGW_ProjectsSchedule" />
           <EntitySet Name="vGroupUser" EntityType="EEModel.vGroupUser" />
           <EntitySet Name="vJobReportForUser" EntityType="EEModel.vJobReportForUser" />
+          <EntitySet Name="EETGW_ProjectsSchedule" EntityType="EEModel.EETGW_ProjectsSchedule" />
+          <EntitySet Name="Auth" EntityType="EEModel.Auth" />
         </EntityContainer>
         <EntityType Name="HolidayLIst">
           <Key>
@@ -774,25 +792,6 @@
           <Property Name="tag" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
           <Property Name="autoinput" Type="Boolean" />
         </EntityType>
-        <EntityType Name="EETGW_ProjectsSchedule">
-          <Key>
-            <PropertyRef Name="idx" />
-          </Key>
-          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="gcode" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
-          <Property Name="project" Type="Int32" />
-          <Property Name="seq" Type="Int32" />
-          <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="sw" Type="Int32" />
-          <Property Name="ew" Type="Int32" />
-          <Property Name="swa" Type="Int32" />
-          <Property Name="ewa" Type="Int32" />
-          <Property Name="memo" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
-          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
-          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
-          <Property Name="uid" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
-          <Property Name="progress" Type="Int32" />
-        </EntityType>
         <EntityType Name="vGroupUser">
           <Key>
             <PropertyRef Name="gcode" />
@@ -842,6 +841,41 @@
           <Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="ww" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
         </EntityType>
+        <EntityType Name="EETGW_ProjectsSchedule">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="gcode" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="project" Type="Int32" />
+          <Property Name="no" Type="Int32" />
+          <Property Name="seq" Type="Int32" />
+          <Property Name="title" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="sw" Type="Int32" />
+          <Property Name="ew" Type="Int32" />
+          <Property Name="swa" Type="Int32" />
+          <Property Name="ewa" Type="Int32" />
+          <Property Name="uid" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="memo" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="appoval" Type="Int32" />
+          <Property Name="progress" Type="Int32" />
+          <Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
+        </EntityType>
+        <EntityType Name="Auth">
+          <Key>
+            <PropertyRef Name="idx" />
+          </Key>
+          <Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="user" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="purchase" Type="Int32" />
+          <Property Name="holyday" Type="Int32" />
+          <Property Name="project" Type="Int32" />
+          <Property Name="jobreport" Type="Int32" />
+          <Property Name="savecost" Type="Int32" />
+          <Property Name="scheapp" Type="Int32" />
+        </EntityType>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -1150,26 +1184,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="EETGW_ProjectsSchedule">
-            <EntityTypeMapping TypeName="EEModel.EETGW_ProjectsSchedule">
-              <MappingFragment StoreEntitySet="EETGW_ProjectsSchedule">
-                <ScalarProperty Name="progress" ColumnName="progress" />
-                <ScalarProperty Name="uid" ColumnName="uid" />
-                <ScalarProperty Name="wdate" ColumnName="wdate" />
-                <ScalarProperty Name="wuid" ColumnName="wuid" />
-                <ScalarProperty Name="memo" ColumnName="memo" />
-                <ScalarProperty Name="ewa" ColumnName="ewa" />
-                <ScalarProperty Name="swa" ColumnName="swa" />
-                <ScalarProperty Name="ew" ColumnName="ew" />
-                <ScalarProperty Name="sw" ColumnName="sw" />
-                <ScalarProperty Name="title" ColumnName="title" />
-                <ScalarProperty Name="seq" ColumnName="seq" />
-                <ScalarProperty Name="project" ColumnName="project" />
-                <ScalarProperty Name="gcode" ColumnName="gcode" />
-                <ScalarProperty Name="idx" ColumnName="idx" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="vGroupUser">
             <EntityTypeMapping TypeName="EEModel.vGroupUser">
               <MappingFragment StoreEntitySet="vGroupUser">
@@ -1220,6 +1234,43 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="EETGW_ProjectsSchedule">
+            <EntityTypeMapping TypeName="EEModel.EETGW_ProjectsSchedule">
+              <MappingFragment StoreEntitySet="EETGW_ProjectsSchedule">
+                <ScalarProperty Name="wdate" ColumnName="wdate" />
+                <ScalarProperty Name="wuid" ColumnName="wuid" />
+                <ScalarProperty Name="progress" ColumnName="progress" />
+                <ScalarProperty Name="appoval" ColumnName="appoval" />
+                <ScalarProperty Name="memo" ColumnName="memo" />
+                <ScalarProperty Name="uid" ColumnName="uid" />
+                <ScalarProperty Name="ewa" ColumnName="ewa" />
+                <ScalarProperty Name="swa" ColumnName="swa" />
+                <ScalarProperty Name="ew" ColumnName="ew" />
+                <ScalarProperty Name="sw" ColumnName="sw" />
+                <ScalarProperty Name="title" ColumnName="title" />
+                <ScalarProperty Name="seq" ColumnName="seq" />
+                <ScalarProperty Name="no" ColumnName="no" />
+                <ScalarProperty Name="project" ColumnName="project" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Auth">
+            <EntityTypeMapping TypeName="EEModel.Auth">
+              <MappingFragment StoreEntitySet="Auth">
+                <ScalarProperty Name="scheapp" ColumnName="scheapp" />
+                <ScalarProperty Name="savecost" ColumnName="savecost" />
+                <ScalarProperty Name="jobreport" ColumnName="jobreport" />
+                <ScalarProperty Name="project" ColumnName="project" />
+                <ScalarProperty Name="holyday" ColumnName="holyday" />
+                <ScalarProperty Name="purchase" ColumnName="purchase" />
+                <ScalarProperty Name="gcode" ColumnName="gcode" />
+                <ScalarProperty Name="user" ColumnName="user" />
+                <ScalarProperty Name="idx" ColumnName="idx" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

SubProject/FPJ0000/Model1.edmx.diagram

@@ -18,9 +18,10 @@
         <EntityTypeShape EntityType="EEModel.Purchase" Width="1.5" PointX="11.375" PointY="0.75" />
         <EntityTypeShape EntityType="EEModel.EETGW_Note" Width="1.5" PointX="11.375" PointY="9.75" />
         <EntityTypeShape EntityType="EEModel.JobReport" Width="1.5" PointX="13.375" PointY="0.75" />
-        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="5.375" PointY="13.75" />
         <EntityTypeShape EntityType="EEModel.vGroupUser" Width="1.5" PointX="13.75" PointY="6.375" />
         <EntityTypeShape EntityType="EEModel.vJobReportForUser" Width="1.5" PointX="11.375" PointY="13.75" />
+        <EntityTypeShape EntityType="EEModel.EETGW_ProjectsSchedule" Width="1.5" PointX="0.75" PointY="4.75" />
+        <EntityTypeShape EntityType="EEModel.Auth" Width="1.5" PointX="5.375" PointY="9.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -30,25 +30,25 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList));
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -98,6 +98,7 @@
             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();
@@ -159,13 +160,13 @@
             this.button1 = new System.Windows.Forms.Button();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.label17 = new System.Windows.Forms.Label();
-            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();
             this.panel4.SuspendLayout();
@@ -175,7 +176,6 @@
             this.toolStrip2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -606,6 +606,193 @@
             this.fpSpread1.StatusBarVisible = true;
             this.fpSpread1.TabIndex = 2;
             // 
+            // fpSpread1_Sheet1
+            // 
+            this.fpSpread1_Sheet1.Reset();
+            this.fpSpread1_Sheet1.SheetName = "Sheet1";
+            // Formulas and custom names must be loaded with R1C1 reference style
+            this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+            this.fpSpread1_Sheet1.ColumnCount = 19;
+            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).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " ";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2;
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No.";
+            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#";
+            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
+            this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType7.DecimalPlaces = 0;
+            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType7.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType7;
+            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 = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType14;
+            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
+            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
+            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType15;
+            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
+            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)";
+            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F;
+            numberCellType8.DecimalPlaces = 0;
+            numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType8.MaximumValue = 2147483647D;
+            numberCellType8.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType8;
+            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj";
+            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
+            this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType17;
+            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process";
+            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType18;
+            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff";
+            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType19;
+            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager";
+            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType20;
+            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain";
+            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W";
+            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType21;
+            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2";
+            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;
+            this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType22;
+            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub";
+            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W";
+            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 = textCellType23;
+            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset";
+            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No.";
+            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true;
+            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType24;
+            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name";
+            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
+            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
+            numberCellType9.DecimalPlaces = 0;
+            numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType9.MaximumValue = 2147483647D;
+            numberCellType9.MinimumValue = -2147483648D;
+            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType9;
+            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt";
+            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F;
+            numberCellType10.MaximumValue = 999999999999999D;
+            numberCellType10.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType10;
+            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo";
+            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F;
+            numberCellType11.MaximumValue = 999999999999999D;
+            numberCellType11.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType11;
+            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn";
+            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            numberCellType12.MaximumValue = 999999999999999D;
+            numberCellType12.MinimumValue = -999999999999999D;
+            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType12;
+            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste";
+            this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType25;
+            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno";
+            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#";
+            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
+            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType26;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
+            this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
+            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;
@@ -638,6 +825,8 @@
             "출고일기준"});
             this.cmbDateType.Name = "cmbDateType";
             this.cmbDateType.Size = new System.Drawing.Size(121, 25);
+            this.cmbDateType.Visible = false;
+            this.cmbDateType.Click += new System.EventHandler(this.cmbDateType_Click);
             // 
             // cmbYearS
             // 
@@ -645,12 +834,14 @@
             this.cmbYearS.DropDownWidth = 70;
             this.cmbYearS.Name = "cmbYearS";
             this.cmbYearS.Size = new System.Drawing.Size(100, 25);
+            this.cmbYearS.Visible = false;
             // 
             // toolStripLabel4
             // 
             this.toolStripLabel4.Name = "toolStripLabel4";
             this.toolStripLabel4.Size = new System.Drawing.Size(15, 22);
             this.toolStripLabel4.Text = "~";
+            this.toolStripLabel4.Visible = false;
             // 
             // cmbYearE
             // 
@@ -658,6 +849,8 @@
             this.cmbYearE.DropDownWidth = 70;
             this.cmbYearE.Name = "cmbYearE";
             this.cmbYearE.Size = new System.Drawing.Size(100, 25);
+            this.cmbYearE.Visible = false;
+            this.cmbYearE.Click += new System.EventHandler(this.cmbYearE_Click);
             // 
             // toolStripLabel6
             // 
@@ -1339,193 +1532,6 @@
             this.label17.Text = "구매 진행";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // 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 = 19;
-            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).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " ";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2;
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No.";
-            this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#";
-            this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
-            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 = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
-            this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
-            this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
-            this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
-            this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)";
-            this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F;
-            numberCellType2.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
-            this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj";
-            this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
-            this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process";
-            this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff";
-            this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager";
-            this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
-            this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain";
-            this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W";
-            this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
-            this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2";
-            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;
-            this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
-            this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub";
-            this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W";
-            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 = textCellType10;
-            this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset";
-            this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No.";
-            this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true;
-            this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11;
-            this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name";
-            this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
-            this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
-            numberCellType3.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt";
-            this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F;
-            numberCellType4.MaximumValue = 999999999999999D;
-            numberCellType4.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4;
-            this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo";
-            this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F;
-            numberCellType5.MaximumValue = 999999999999999D;
-            numberCellType5.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5;
-            this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn";
-            this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            numberCellType6.MaximumValue = 999999999999999D;
-            numberCellType6.MinimumValue = -999999999999999D;
-            this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6;
-            this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste";
-            this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12;
-            this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno";
-            this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#";
-            this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
-            this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
-            this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
-            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;
@@ -1547,6 +1553,7 @@
             ((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);
@@ -1559,7 +1566,6 @@
             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

@@ -153,14 +153,18 @@ namespace FPJ0000
 
             if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and ";    //삭제보기 햇을 경우
 
-            var dateField = "pdate";
+            //var dateField = "pdate";
-            if (cmbDateType.SelectedIndex == 1) dateField = "edate";
+            //if (cmbDateType.SelectedIndex == 1) dateField = "edate";
-            else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
+            //else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
 
-            State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
+            //State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
-               "ISNULL(usermain, '') LIKE @username OR " +
+            //   "ISNULL(usermain, '') LIKE @username OR " +
-               "ISNULL(reqstaff, '') LIKE @username OR " +
+            //   "ISNULL(reqstaff, '') LIKE @username OR " +
-               "ISNULL(usersub, '') LIKE @username) ";
+            //   "ISNULL(usersub, '') LIKE @username) ";
+            State_where += " (ISNULL(userManager, '') LIKE @username OR " +
+             "ISNULL(usermain, '') LIKE @username OR " +
+             "ISNULL(reqstaff, '') LIKE @username OR " +
+             "ISNULL(usersub, '') LIKE @username) ";
 
             if (state != "") State_where += " AND " + state;
             if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
@@ -750,5 +754,15 @@ namespace FPJ0000
         {
 
         }
+
+        private void cmbDateType_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void cmbYearE_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

SubProject/FPJ0000/Project/fProjectList.resx

@@ -230,36 +230,39 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rlGLylIJXKQt2mzT
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/TxJxHMbvP2prU1c613CLylIJXKQt2mzT
-        1ZqrqWtYgERijlWrZimhu5mUjohorLKEFIeaRhq5Xu0Fe4FLIBBB2bqne7/cKZf8qT7b2d3uc87Zs+8e
+        1ZqrqWtYHBhDc8xaNUsJ3WVSOiKiscoCUhxqGmrk+qoV9gWOQCCCsnVPd8dNOfKnem3Pbrv38zx777M3
-        6r8xOT+i/WYQBtt76Abmcbz/DdT0q0fCWETfaEzTO7K40PswCos7gu4HEVCpzC/kq9HoZoWMCNoT+57v
+        8d8YHR/RcTsIvfU9tEOLOD34Fmrq9RNhLGJgLKbpH11Z7n8chdkdQe+jCIhU5hfy1WRwMUJGBOWJfc/3
-        pU759DB4NdCNqHHM3Ux+NpifQciI6PF8JfP+ucugA5dgmbkACnnwhgMXZ1ctMA9HyDwXyuoNI1e8Yf95
+        Emd9bdB7NdCOqnHK3cL/bDQ9h5AR0ef5ys8HF66CClyBee4SCOTBGY5cnt+wwOSK8PNcCIs3jFxxhsMX
-        v6igxipTVNE7UNElhbJbJvJTtvGQ0JUlkshAdWZquaDGWq6QnyxjW4dbYBxtReXZbSTIMzAWyhY4JsNw
+        /aKCWotMUU3tQWWPFMpemchPWCdCQleWSCID1bnptYJaS4VCri9ndK5WtI/pUHV+Fx/kGBoPZQvsU2HY
-        TITgmg7h7ZckdndMkAJlX7lCpt/Kqu82Ype5EqUniiBt24hBXxg2XuPM3xu8/pRAVZsPCnp7dYVOyja7
+        J0NwzoSw9CWJ/Z2TfIFyoEIh0+1k1PebsM9UhdIzRZAayjDsC8PKaYL+e4M3nxKoNvigoHbXVJJSpsXZ
-        GiDRFrMl2oItplsLSKSXYJ9kiNfBfUkB2YLbwM6pzrYP8p4y1F7bg8POg9igXceu167dzG9ktH9APLUE
+        CAlZzJSQBTuMd5aRSK/CNkXzXjv75Qv4LdgNbKzqrYcg7ytH3Y0DOO44im3kFmYruXk7t1G77QPiqVU4
-        5xSD29NZUUNPGCTTKy+rulINnUeNQ446lGqL2MKWbJhHP/gOi99+4o4/u8H9Ge6QXI8Z5ErZJYekvRgl
+        pmncncmKGJmlkUyvv6zqWg20HjWO2etRShYxha3ZMEfb8DusfPuJe/7sBg/n2ENyPqWRK2WPHJKOYpRo
-        ugIUHl2zHObRXJ8nBUNckA+TghvcQ+TyIhiHyuRb9Q7UV18ixhW4n0aI1xPgCvhAvjZ1eH4LGRFN9HNE
+        C1B4ctNamENzc5EvGGGDXJgvuMU+RC4vg3GojL4N70B9/RVibIH7WYT3egJsARfIV1mn57eQEdFMvUA0
-        kz/AxDP4HE0jyKRA7TR4kS9J0z2HkBFxxDI3Vt8ZSNV3zqL2nB97T6/cyz9CUX8AcJks2URqZdcAAAAA
+        +QN0PIPP0TSCdArEXr0X+ZI0P7ALGREnzAvjDd2BVEP3POou+HGwa/1e/hGC+ANihyzTq1/1MwAAAABJ
-        SUVORK5CYII=
+        RU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ
-        JB5MNF7ARIMJBw8gISBqwLCoCRJcQHZBKRJaQwgGuoBQpCMOpS3TUipTgSkznaXT6Ty/llHUxMTlZV5m
+        Eg8mGi9gosGEgwceGhCVoDzUBAhEQd6CMiRshhAMbAOEIatYxja7MSadQEe7PtZ1/frfqKImJj6+6Td9
-        yfd7/2Wo/9bSSMFCaPisFv7FK6MnA/6XR/YH+gpyfvLbgpyJiaJ9Jk5Rrg6LahhpAAa5Mt59TikxRCZK
+        5P/5/h6l/lvLI3mLweGzWugXr46e9PteHNnv78vL+slv8rImJgr2mThFuTosqmGkABjkSnv3OalEEZ4o
-        kmvOC+o3R+euKSFnWYh5fey8iVMUPVQYN3QFaqQBUrAREvsEcmgARoonWQkYuki8s/ue2gbHcUlm0EKb
+        Sqw5L6jfHJm/pgSdJUHm1bHzJk5R9FB+zNAVqOE6SIF6SGw75OAAjCRPsuIwdJF4Z/c9uQ2O4xLMoIU2
-        OEX5uo4KaW2HwC1I+JshfKzC1kwJYrNXwXtrwC/eAr9wE9uecuIy0hkH3+Bx0cRJQH+hlpI3wNMt2J6v
+        cYrydh0VUtoOgZsQ9zVC+FCJrdkiROeugvdUgV+qAL94E9vuUuIS0hkH7+Bx0cRJQH++lpQ3wNNN2F6o
-        Azd5AzLnJlUFs3rmHv/eQWY8T3++YuKZDk5o2fnTKrEM6FIW1GUGavQBaLoXVocL7eMsuqfWYfeEkdmb
+        ATd5AzI3Q6oKZvX0Pfa9g/R47v5cxcTTHZzQMvOnVGIZ0KUMqMsM1Mgj0HQvrA4X2sZZdE+tw+4OIb03
-        iZOAFkvS0GXoggsp3gZtcwDJjTYoa/fgXezAyByHlc8SVjdVuAMCxha+YNjaqJs4+QutFjWtCdC2rEhy
+        EycBTZaEocvQBReSvA3a5gASG61Q1u7Ds9SBkXkOq58lfNpUMeMXMLb4BcPWh7qJk7/QbFFTmgBty4oE
-        ndmqSrgGcrAcfY4oliIiZlgZjqCEaWJvVEXPOxYmTlGe+/mKofEEfgZ1vRFKqIrAZZB8l7Nt+2MqHIEE
+        15mpqoSqIAdK0eeIYDksYpaV4QhImCb2RFT0vGVh4hTlfpCrGBpP4KdQ1+uhBCsJXALJeznTti+qwuGP
-        pvwJjDMi5sIqOicjewHLd/KicpyOB53d6cRKO0TfQ4hMA8RPteghMy+tS5j07cIZv19T0Tq6vBfA1OZe
+        Y8oXxzgjYj6konMyvBewcjcnIsfomN/RnYqvtkH0PobI1EH8WI0eMvPyuoRJ7y6c9rs1Fc2jK3sBTHX2
-        Z+oOd9G3D8U8dXnKj34z1KS7/QLmCeRkFcyS6tYPIqrr2wxbxamLZsTv1WRjD7Ta2cp+sove6Sge293p
+        dabmcBd951DUXZOj/OjXQ/X6jE/AAoGcrII5Ut36XsSt2hbDVnbqohnxezXY2APNdra8n+yidzqCFrsr
-        qvqnhnesDa7mYuFFaW6xefTP9arizBXno0t80NaE0eoiyfz8d3peerB4rPK0bL97bm8X/yaK+gpvpyRE
+        VVHbbnjGWuFqLBSeF2cXmkf/XC/LzlxxPrnEB2wNGL1dIJmf/07Pig8WjpWflu33zu3t4t9EUV8BYv4k
-        ifAKVAAAAABJRU5ErkJggg==
+        OVzp+PUAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>387, 17</value>
   </metadata>
@@ -317,12 +320,18 @@
   <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>561, 17</value>
   </metadata>
+  <metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>561, 17</value>
+  </metadata>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>731, 17</value>
   </metadata>
   <metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>647, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>731, 17</value>
+  </metadata>
   <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>169, 56</value>
   </metadata>

SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs

@@ -39,20 +39,20 @@
             System.Windows.Forms.Label pdateLabel;
             System.Windows.Forms.Label label2;
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectSchedule));
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
+            FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
-            FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+            FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
             this.dsPRJ = new FPJ0000.dsPRJ();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
             this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter();
@@ -129,7 +129,10 @@
             this.tbIdx = new System.Windows.Forms.TextBox();
             this.nameTextBox = new System.Windows.Forms.TextBox();
             this.pdateTextBox = new System.Windows.Forms.TextBox();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.taProjectInfo = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
+            this.chkapp1 = new System.Windows.Forms.ToolStripButton();
+            this.chkapp2 = new System.Windows.Forms.ToolStripButton();
             statusLabel = new System.Windows.Forms.Label();
             odateLabel = new System.Windows.Forms.Label();
             edateLabel = new System.Windows.Forms.Label();
@@ -296,8 +299,10 @@
             this.bindingNavigatorDeleteItem,
             this.projectsScheduleBindingNavigatorSaveItem,
             this.toolStripButton1,
-            this.toolStripButton10});
+            this.toolStripButton10,
-            this.bn.Location = new System.Drawing.Point(5, 221);
+            this.chkapp2,
+            this.chkapp1});
+            this.bn.Location = new System.Drawing.Point(5, 259);
             this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
             this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
             this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
@@ -442,7 +447,7 @@
             this.fpSpread1.Name = "fpSpread1";
             this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread1_Sheet1});
-            this.fpSpread1.Size = new System.Drawing.Size(795, 202);
+            this.fpSpread1.Size = new System.Drawing.Size(795, 240);
             this.fpSpread1.TabIndex = 1;
             // 
             // cm1
@@ -541,68 +546,68 @@
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "완료";
             this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "%";
             this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 21F;
-            numberCellType1.DecimalPlaces = 0;
+            numberCellType29.DecimalPlaces = 0;
-            numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType1.MaximumValue = 2147483647D;
+            numberCellType29.MaximumValue = 2147483647D;
-            numberCellType1.MinimumValue = -2147483648D;
+            numberCellType29.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29;
             this.fpSpread1_Sheet1.Columns.Get(0).DataField = "seq";
             this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+            this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29;
             this.fpSpread1_Sheet1.Columns.Get(1).DataField = "title";
             this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType2.DecimalPlaces = 0;
+            numberCellType30.DecimalPlaces = 0;
-            numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType2.MaximumValue = 2147483647D;
+            numberCellType30.MaximumValue = 2147483647D;
-            numberCellType2.MinimumValue = -2147483648D;
+            numberCellType30.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType30;
             this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sw";
             this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작";
             this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType3.DecimalPlaces = 0;
+            numberCellType31.DecimalPlaces = 0;
-            numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType3.MaximumValue = 2147483647D;
+            numberCellType31.MaximumValue = 2147483647D;
-            numberCellType3.MinimumValue = -2147483648D;
+            numberCellType31.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType31;
             this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ew";
             this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(3).Label = "완료";
             this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType4.DecimalPlaces = 0;
+            numberCellType32.DecimalPlaces = 0;
-            numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType32.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType4.MaximumValue = 2147483647D;
+            numberCellType32.MaximumValue = 2147483647D;
-            numberCellType4.MinimumValue = -2147483648D;
+            numberCellType32.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType4;
+            this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType32;
             this.fpSpread1_Sheet1.Columns.Get(4).DataField = "swa";
             this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(4).Label = "시작";
             this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType5.DecimalPlaces = 0;
+            numberCellType33.DecimalPlaces = 0;
-            numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType33.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType5.MaximumValue = 2147483647D;
+            numberCellType33.MaximumValue = 2147483647D;
-            numberCellType5.MinimumValue = -2147483648D;
+            numberCellType33.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType5;
+            this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType33;
             this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ewa";
             this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료";
             this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType6.DecimalPlaces = 0;
+            numberCellType34.DecimalPlaces = 0;
-            numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType34.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType6.MaximumValue = 2147483647D;
+            numberCellType34.MaximumValue = 2147483647D;
-            numberCellType6.MinimumValue = -2147483648D;
+            numberCellType34.MinimumValue = -2147483648D;
-            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType6;
+            this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType34;
             this.fpSpread1_Sheet1.Columns.Get(6).DataField = "progress";
             this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(6).Label = "%";
             this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType2;
+            this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30;
             this.fpSpread1_Sheet1.Columns.Get(7).DataField = "uid";
             this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
             this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31;
             this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo";
             this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
             this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -615,10 +620,10 @@
             this.groupBox1.Controls.Add(this.fpSpread1);
             this.groupBox1.Controls.Add(this.bn);
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox1.Location = new System.Drawing.Point(332, 0);
+            this.groupBox1.Location = new System.Drawing.Point(332, 28);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
-            this.groupBox1.Size = new System.Drawing.Size(805, 251);
+            this.groupBox1.Size = new System.Drawing.Size(805, 289);
             this.groupBox1.TabIndex = 2;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Schedule";
@@ -627,10 +632,10 @@
             // 
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox2.Location = new System.Drawing.Point(5, 256);
+            this.groupBox2.Location = new System.Drawing.Point(5, 322);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
-            this.groupBox2.Size = new System.Drawing.Size(654, 410);
+            this.groupBox2.Size = new System.Drawing.Size(654, 344);
             this.groupBox2.TabIndex = 3;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Time Table";
@@ -641,7 +646,7 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(5, 19);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(644, 386);
+            this.panel1.Size = new System.Drawing.Size(644, 320);
             this.panel1.TabIndex = 0;
             this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
             this.panel1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseClick);
@@ -652,10 +657,10 @@
             this.groupBox3.Controls.Add(this.groupBox4);
             this.groupBox3.Controls.Add(this.bnTodo);
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBox3.Location = new System.Drawing.Point(659, 256);
+            this.groupBox3.Location = new System.Drawing.Point(659, 322);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(10);
-            this.groupBox3.Size = new System.Drawing.Size(483, 410);
+            this.groupBox3.Size = new System.Drawing.Size(483, 344);
             this.groupBox3.TabIndex = 4;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "Todo";
@@ -670,7 +675,7 @@
             this.fpSpread2.Name = "fpSpread2";
             this.fpSpread2.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
             this.fpSpread2_Sheet1});
-            this.fpSpread2.Size = new System.Drawing.Size(463, 251);
+            this.fpSpread2.Size = new System.Drawing.Size(463, 185);
             this.fpSpread2.TabIndex = 1;
             // 
             // cm2
@@ -754,27 +759,27 @@
             this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일";
             this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행";
             this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
-            this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType4;
+            this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType32;
             this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort";
             this.fpSpread2_Sheet1.Columns.Get(0).Label = "No";
             this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F;
-            this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType5;
+            this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType33;
             this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title";
             this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목";
             this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F;
-            this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType6;
+            this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType34;
             this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate";
             this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일";
             this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F;
-            this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType7;
+            this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType35;
             this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate";
             this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일";
             this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F;
-            numberCellType7.DecimalPlaces = 0;
+            numberCellType35.DecimalPlaces = 0;
-            numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+            numberCellType35.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
-            numberCellType7.MaximumValue = 2147483647D;
+            numberCellType35.MaximumValue = 2147483647D;
-            numberCellType7.MinimumValue = -2147483648D;
+            numberCellType35.MinimumValue = -2147483648D;
-            this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType7;
+            this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType35;
             this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process";
             this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행";
             this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F;
@@ -792,7 +797,7 @@
             // 
             this.groupBox4.Controls.Add(this.textBox1);
             this.groupBox4.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.groupBox4.Location = new System.Drawing.Point(10, 275);
+            this.groupBox4.Location = new System.Drawing.Point(10, 209);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(10);
             this.groupBox4.Size = new System.Drawing.Size(463, 100);
@@ -831,7 +836,7 @@
             this.toolStripButton7,
             this.toolStripButton8,
             this.toolStripButton9});
-            this.bnTodo.Location = new System.Drawing.Point(10, 375);
+            this.bnTodo.Location = new System.Drawing.Point(10, 309);
             this.bnTodo.MoveFirstItem = this.toolStripButton2;
             this.bnTodo.MoveLastItem = this.toolStripButton5;
             this.bnTodo.MoveNextItem = this.toolStripButton4;
@@ -966,10 +971,11 @@
             // 
             this.panel2.Controls.Add(this.groupBox1);
             this.panel2.Controls.Add(this.panel3);
+            this.panel2.Controls.Add(this.comboBox1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(5, 5);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1137, 251);
+            this.panel2.Size = new System.Drawing.Size(1137, 317);
             this.panel2.TabIndex = 6;
             // 
             // panel3
@@ -996,9 +1002,9 @@
             this.panel3.Controls.Add(pdateLabel);
             this.panel3.Controls.Add(this.pdateTextBox);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panel3.Location = new System.Drawing.Point(0, 0);
+            this.panel3.Location = new System.Drawing.Point(0, 28);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(332, 251);
+            this.panel3.Size = new System.Drawing.Size(332, 289);
             this.panel3.TabIndex = 36;
             // 
             // textBox3
@@ -1110,10 +1116,42 @@
             this.pdateTextBox.TabIndex = 5;
             this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // comboBox1
+            // 
+            this.comboBox1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox1.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.comboBox1.FormattingEnabled = true;
+            this.comboBox1.Location = new System.Drawing.Point(0, 0);
+            this.comboBox1.Name = "comboBox1";
+            this.comboBox1.Size = new System.Drawing.Size(1137, 28);
+            this.comboBox1.TabIndex = 2;
+            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+            // 
             // taProjectInfo
             // 
             this.taProjectInfo.ClearBeforeFill = true;
             // 
+            // chkapp1
+            // 
+            this.chkapp1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.chkapp1.Image = global::FPJ0000.Properties.Resources.accept;
+            this.chkapp1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.chkapp1.Name = "chkapp1";
+            this.chkapp1.Size = new System.Drawing.Size(58, 22);
+            this.chkapp1.Text = "승인1";
+            this.chkapp1.Click += new System.EventHandler(this.chkapp1_Click);
+            // 
+            // chkapp2
+            // 
+            this.chkapp2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.chkapp2.Image = global::FPJ0000.Properties.Resources.accept;
+            this.chkapp2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.chkapp2.Name = "chkapp2";
+            this.chkapp2.Size = new System.Drawing.Size(58, 22);
+            this.chkapp2.Text = "승인2";
+            this.chkapp2.Click += new System.EventHandler(this.chkapp2_Click);
+            // 
             // fProjectSchedule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1237,5 +1275,8 @@
         private System.Windows.Forms.BindingSource bsPrjinfo;
         private dsPRJTableAdapters.ProjectsTableAdapter taProjectInfo;
         private System.Windows.Forms.TextBox textBox3;
+        private System.Windows.Forms.ComboBox comboBox1;
+        private System.Windows.Forms.ToolStripButton chkapp1;
+        private System.Windows.Forms.ToolStripButton chkapp2;
     }
 }

SubProject/FPJ0000/Project/fProjectSchedule.cs

@@ -16,7 +16,8 @@ namespace FPJ0000
         int projectindex = 0;
         EEEntities db;
         List<EETGW_ProjectsSchedule> list;
-        Boolean bini = false;
+        Boolean bInit = false;
+        
         public fProjectSchedule(int project_)
         {
             InitializeComponent();
@@ -26,6 +27,7 @@ namespace FPJ0000
             fn_fpcolsize2 = util.MakeFilePath(util.CurrentPath, "formSetting", "fp2_" + this.Name + ".ini");
             this.FormClosed += FProjectSchedule_FormClosed;
             this.FormClosing += FProjectSchedule_FormClosing;
+            this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow += ProjectsSchedule_TableNewRow;
         }
 
         private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e)
@@ -47,7 +49,7 @@ namespace FPJ0000
 
         private void FProjectSchedule_FormClosed(object sender, FormClosedEventArgs e)
         {
-
+            this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow -= ProjectsSchedule_TableNewRow;
             this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged;
         }
 
@@ -56,6 +58,8 @@ namespace FPJ0000
             e.Row["wuid"] = FCOMMON.info.Login.no;
             e.Row["wdate"] = DateTime.Now;
             e.Row["project"] = this.projectindex;
+            e.Row["appoval"] = 0; //신규추가는 확정안되는 데이터이다
+            e.Row["no"] = int.Parse(this.comboBox1.Text);
         }
 
         private void fProjectSchedule_Load(object sender, EventArgs e)
@@ -63,11 +67,35 @@ namespace FPJ0000
             //프로젝트 정보 채우기
             this.taProjectInfo.FillByIDX(this.dsPRJ.Projects, this.projectindex);
 
+            //스케쥴 그룹(no)
+            var db = new EEEntities();
+            var nolist = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).GroupBy(t => t.no).ToList();
+            this.comboBox1.Items.Clear();
+            foreach (var item in nolist)
+            {
+                if (item.Key == null) this.comboBox1.Items.Add("1");
+                else this.comboBox1.Items.Add(item.Key.ToString());
+            }
+            db.Dispose();
+
+            if (this.comboBox1.Items.Count == 0)
+            {
+                util.MsgE("이 프로젝트에는 스케쥴이 등록되지 않았습니다\n" +
+                    "스케쥴을 등록한 후 에는 관리자이 승인과정이 필요하며 승인이 완료되면 계획은 수정할 수 없습니다");
+                this.comboBox1.Items.Add("1");
+                this.comboBox1.SelectedIndex = 0;
+            }
+            else
+            {
+                this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 1;
+            }
+            this.comboBox1.Items.Add("스케쥴 추가");
+
 
             RefreshData();
             RefreshGraph();
             this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged;
-            bini = true;
+         
 
             //시작할떄 cww 를 가져오낟.
             var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToShortDateString() + "')";
@@ -77,14 +105,14 @@ namespace FPJ0000
             CWW = int.Parse(wccstr.ToString());
             cmd.Connection.Close();
             cmd.Dispose();
-
+            bInit = true;
         }
 
         int CWW = 0;
 
         private void EETGW_ProjectsSchedule_RowChanged(object sender, DataRowChangeEventArgs e)
         {
-            if (bini == false) return;
+            if (bInit == false) return;
             RefreshGraph();
         }
 
@@ -94,10 +122,12 @@ namespace FPJ0000
         }
         void RefreshData()
         {
+            var scno = int.Parse(comboBox1.Text);
             try
             {
                 //list = db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).OrderBy(t => t.seq).ToList();
-                this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex);
+
+                this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex, scno);
                 this.taTodo.Fill(this.dsPRJ.EETGW_ProjectToDo, this.projectindex);
                 //this.bs.DataSource = list;//.ToList();// db.EETGW_ProjectsSchedule.Local;
                 //this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -108,6 +138,45 @@ namespace FPJ0000
             {
                 System.Windows.Forms.MessageBox.Show(ex.Message);
             }
+            Application.DoEvents();
+
+            //해당스케쥴의 승인상태를 확인
+            var db = new EEEntities();
+            var dr = db.EETGW_ProjectsSchedule.Where(t => t.project == this.projectindex && t.no == scno).FirstOrDefault();
+            if (dr == null || dr.appoval == 0)
+            {
+                chkapp1.Checked = false;
+                chkapp2.Checked = false;
+
+      
+            }
+            else if (dr.appoval == 1)
+            {
+                chkapp1.Checked = true;
+                chkapp2.Checked = false;
+
+                this.fpSpread1.Sheets[0].Columns[2].Locked = true;
+                this.fpSpread1.Sheets[0].Columns[3].Locked = true;
+                this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230);
+                this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230);
+
+            }
+            else
+            {
+                chkapp1.Checked = true;
+                chkapp2.Checked = true;
+
+                this.fpSpread1.Sheets[0].Columns[2].Locked = true;
+                this.fpSpread1.Sheets[0].Columns[3].Locked = true;
+                this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230);
+                this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230);
+            }
+
+   
+  
+
+
+
         }
         private void projectsScheduleBindingNavigatorSaveItem_Click(object sender, EventArgs e)
         {
@@ -405,7 +474,7 @@ namespace FPJ0000
                         //actual
                         if (ww >= swa && ww <= ewa)
                             e.Graphics.FillRectangle(new SolidBrush(ABg), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height);
-                        else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW  )
+                        else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW)
                         {
                             e.Graphics.FillRectangle(new SolidBrush(Color.Pink), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height);
                         }
@@ -515,5 +584,65 @@ namespace FPJ0000
             //lad
             FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2);
         }
+
+        private void chkapp1_Click(object sender, EventArgs e)
+        {
+            //권한이 있어야한다.
+            var db = new EEEntities();
+            var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault();
+            if (dr == null || dr.scheapp == null || dr.scheapp < 1)
+            {
+                util.MsgE("'승인권한1'이 없습니다");
+                return;
+            }
+            if(chkapp1.Checked)
+            {
+                util.MsgE("'승인해제1'는 현재 구현 중");
+            }
+            else
+            {
+                chkapp1.Checked = true;
+                foreach(var item in this.dsPRJ.EETGW_ProjectsSchedule)
+                {
+                    if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue;
+                    item.appoval = 1;
+                }
+            }
+        }
+
+        private void chkapp2_Click(object sender, EventArgs e)
+        {
+            //권한이 있어야한다.
+            var db = new EEEntities();
+            var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault();
+            if (dr == null || dr.scheapp == null || dr.scheapp < 2)
+            {
+                util.MsgE("'승인권한2'이 없습니다");
+                return;
+            }
+            if (chkapp2.Checked)
+            {
+                util.MsgE("승인해제2'는 현재 구현 중");
+            }
+            else
+            {
+                chkapp2.Checked = true;
+                foreach (var item in this.dsPRJ.EETGW_ProjectsSchedule)
+                {
+                    if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue;
+                    item.appoval = 2;
+                }
+            }
+        }
+
+        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (bInit == false) return;
+            if(comboBox1.SelectedIndex == this.comboBox1.Items.Count-1)
+            {
+                util.MsgE("스케쥴 신규 추가 기능은 준비 중 입니다");
+                this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 2;
+            }
+        }
     }
 }

SubProject/FPJ0000/Project/fProjectSchedule.resx

@@ -252,6 +252,9 @@
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>239, 17</value>
   </metadata>
+  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>871, 17</value>
+  </metadata>
   <data name="autoToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -291,12 +294,18 @@
         vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
 </value>
   </data>
-  <metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bnTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>871, 17</value>
+    <value>624, 17</value>
   </metadata>
   <metadata name="cm2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1023, 17</value>
   </metadata>
+  <metadata name="fpSpread2_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>719, 17</value>
+  </metadata>
+  <metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>440, 17</value>
+  </metadata>
   <data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -336,12 +345,6 @@
         vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
 </value>
   </data>
-  <metadata name="fpSpread2_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>719, 17</value>
-  </metadata>
-  <metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>440, 17</value>
-  </metadata>
   <metadata name="bnTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>624, 17</value>
   </metadata>
@@ -434,6 +437,9 @@
   <metadata name="bsPrjinfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1098, 17</value>
   </metadata>
+  <metadata name="bsPrjinfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1098, 17</value>
+  </metadata>
   <metadata name="taProjectInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>

SubProject/FPJ0000/app.config

@@ -1,33 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="FPJ0000.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="FPJ0000.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
-                                                                                                                      </configSections>
+  </configSections>
   <connectionStrings>
-    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
+    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient" />
-      providerName="System.Data.SqlClient" />
+    <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient" />
-    <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
+    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient" />
-      providerName="System.Data.SqlClient" />
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-      providerName="System.Data.EntityClient" />
-    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
-      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
   </startup>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="mssqllocaldb"/>
+        <parameter value="mssqllocaldb" />
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <userSettings>

SubProject/FPJ0000/dsPRJ.Designer.cs

@@ -9425,6 +9425,10 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnuid;
             
+            private global::System.Data.DataColumn columnappoval;
+            
+            private global::System.Data.DataColumn columnno;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public EETGW_ProjectsScheduleDataTable() {
@@ -9570,6 +9574,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn appovalColumn {
+                get {
+                    return this.columnappoval;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn noColumn {
+                get {
+                    return this.columnno;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -9607,7 +9627,7 @@ namespace FPJ0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate, string uid) {
+            public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate, string uid, int appoval, int no) {
                 EETGW_ProjectsScheduleRow rowEETGW_ProjectsScheduleRow = ((EETGW_ProjectsScheduleRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -9623,7 +9643,9 @@ namespace FPJ0000 {
                         progress,
                         wuid,
                         wdate,
-                        uid};
+                        uid,
+                        appoval,
+                        no};
                 rowEETGW_ProjectsScheduleRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowEETGW_ProjectsScheduleRow);
                 return rowEETGW_ProjectsScheduleRow;
@@ -9667,6 +9689,8 @@ namespace FPJ0000 {
                 this.columnwuid = base.Columns["wuid"];
                 this.columnwdate = base.Columns["wdate"];
                 this.columnuid = base.Columns["uid"];
+                this.columnappoval = base.Columns["appoval"];
+                this.columnno = base.Columns["no"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -9700,6 +9724,10 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnwdate);
                 this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnuid);
+                this.columnappoval = new global::System.Data.DataColumn("appoval", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnappoval);
+                this.columnno = new global::System.Data.DataColumn("no", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnno);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -18559,6 +18587,38 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int appoval {
+                get {
+                    if (this.IsappovalNull()) {
+                        return 0;
+                    }
+                    else {
+                        return ((int)(this[this.tableEETGW_ProjectsSchedule.appovalColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_ProjectsSchedule.appovalColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public int no {
+                get {
+                    if (this.IsnoNull()) {
+                        return 1;
+                    }
+                    else {
+                        return ((int)(this[this.tableEETGW_ProjectsSchedule.noColumn]));
+                    }
+                }
+                set {
+                    this[this.tableEETGW_ProjectsSchedule.noColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsgcodeNull() {
@@ -18690,6 +18750,30 @@ namespace FPJ0000 {
             public void SetuidNull() {
                 this[this.tableEETGW_ProjectsSchedule.uidColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsappovalNull() {
+                return this.IsNull(this.tableEETGW_ProjectsSchedule.appovalColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetappovalNull() {
+                this[this.tableEETGW_ProjectsSchedule.appovalColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsnoNull() {
+                return this.IsNull(this.tableEETGW_ProjectsSchedule.noColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetnoNull() {
+                this[this.tableEETGW_ProjectsSchedule.noColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -32840,10 +32924,12 @@ WHERE  (gcode = @gcode)";
             tableMapping.ColumnMappings.Add("wuid", "wuid");
             tableMapping.ColumnMappings.Add("wdate", "wdate");
             tableMapping.ColumnMappings.Add("uid", "uid");
+            tableMapping.ColumnMappings.Add("appoval", "appoval");
+            tableMapping.ColumnMappings.Add("no", "no");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -32868,10 +32954,14 @@ WHERE  (gcode = @gcode)";
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid], [appoval], [no]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid, @appoval, @no);
-SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq";
+SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -32886,10 +32976,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)));
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid, [appoval] = @appoval, [no] = @no WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)));
-SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq";
+SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -32904,6 +32996,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -32927,6 +33021,10 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
@@ -32944,18 +33042,19 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT  idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, " +
-                "wdate, uid\r\nFROM     EETGW_ProjectsSchedule\r\nWHERE  (gcode = @gcode) AND (projec" +
+                "wdate, uid, appoval, no\r\nFROM     EETGW_ProjectsSchedule\r\nWHERE  (gcode = @gcode" +
-                "t = @project)\r\nORDER BY seq";
+                ") AND (project = @project) AND (no = @no)\r\nORDER BY seq";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
-        public virtual int Fill(dsPRJ.EETGW_ProjectsScheduleDataTable dataTable, string gcode, global::System.Nullable<int> project) {
+        public virtual int Fill(dsPRJ.EETGW_ProjectsScheduleDataTable dataTable, string gcode, global::System.Nullable<int> project, global::System.Nullable<int> no) {
             this.Adapter.SelectCommand = this.CommandCollection[0];
             if ((gcode == null)) {
                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -32969,6 +33068,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((no.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(no.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
             if ((this.ClearBeforeFill == true)) {
                 dataTable.Clear();
             }
@@ -32980,7 +33085,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
-        public virtual dsPRJ.EETGW_ProjectsScheduleDataTable GetData(string gcode, global::System.Nullable<int> project) {
+        public virtual dsPRJ.EETGW_ProjectsScheduleDataTable GetData(string gcode, global::System.Nullable<int> project, global::System.Nullable<int> no) {
             this.Adapter.SelectCommand = this.CommandCollection[0];
             if ((gcode == null)) {
                 this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -32994,6 +33099,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             else {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
+            if ((no.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(no.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
             dsPRJ.EETGW_ProjectsScheduleDataTable dataTable = new dsPRJ.EETGW_ProjectsScheduleDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -33032,7 +33143,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
-        public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_seq, string Original_title, global::System.Nullable<int> Original_sw, global::System.Nullable<int> Original_ew, global::System.Nullable<int> Original_swa, global::System.Nullable<int> Original_ewa, global::System.Nullable<int> Original_progress, string Original_wuid, System.DateTime Original_wdate, string Original_uid) {
+        public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable<int> Original_project, global::System.Nullable<int> Original_seq, string Original_title, global::System.Nullable<int> Original_sw, global::System.Nullable<int> Original_ew, global::System.Nullable<int> Original_swa, global::System.Nullable<int> Original_ewa, global::System.Nullable<int> Original_progress, string Original_wuid, System.DateTime Original_wdate, string Original_uid, global::System.Nullable<int> Original_appoval, global::System.Nullable<int> Original_no) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -33121,6 +33232,22 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                 this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_uid));
             }
+            if ((Original_appoval.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[24].Value = ((int)(Original_appoval.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value;
+            }
+            if ((Original_no.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[26].Value = ((int)(Original_no.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
             if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -33141,7 +33268,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(string gcode, global::System.Nullable<int> project, global::System.Nullable<int> seq, string title, global::System.Nullable<int> sw, global::System.Nullable<int> ew, global::System.Nullable<int> swa, global::System.Nullable<int> ewa, string memo, global::System.Nullable<int> progress, string wuid, System.DateTime wdate, string uid) {
+        public virtual int Insert(string gcode, global::System.Nullable<int> project, global::System.Nullable<int> seq, string title, global::System.Nullable<int> sw, global::System.Nullable<int> ew, global::System.Nullable<int> swa, global::System.Nullable<int> ewa, string memo, global::System.Nullable<int> progress, string wuid, System.DateTime wdate, string uid, global::System.Nullable<int> appoval, global::System.Nullable<int> no) {
             if ((gcode == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -33215,6 +33342,18 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             else {
                 this.Adapter.InsertCommand.Parameters[12].Value = ((string)(uid));
             }
+            if ((appoval.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[13].Value = ((int)(appoval.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            if ((no.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[14].Value = ((int)(no.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -33249,6 +33388,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                     string wuid, 
                     System.DateTime wdate, 
                     string uid, 
+                    global::System.Nullable<int> appoval, 
+                    global::System.Nullable<int> no, 
                     int Original_idx, 
                     string Original_gcode, 
                     global::System.Nullable<int> Original_project, 
@@ -33262,6 +33403,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
                     string Original_uid, 
+                    global::System.Nullable<int> Original_appoval, 
+                    global::System.Nullable<int> Original_no, 
                     int idx) {
             if ((gcode == null)) {
                 this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -33336,95 +33479,123 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             else {
                 this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(uid));
             }
-            this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx));
+            if ((appoval.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(appoval.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
+            }
+            if ((no.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(no.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx));
             if ((Original_gcode == null)) {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_gcode));
-            }
-            if ((Original_project.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value));
-            }
-            else {
                 this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
             }
-            if ((Original_seq.HasValue == true)) {
+            else {
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_gcode));
+            }
+            if ((Original_project.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_seq.Value));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_project.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
             }
-            if ((Original_title == null)) {
+            if ((Original_seq.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_seq.Value));
+            }
+            else {
                 this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
             }
-            else {
+            if ((Original_title == null)) {
-                this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_title));
-            }
-            if ((Original_sw.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_sw.Value));
-            }
-            else {
                 this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
             }
-            if ((Original_ew.HasValue == true)) {
+            else {
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_title));
+            }
+            if ((Original_sw.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_ew.Value));
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_sw.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
             }
-            if ((Original_swa.HasValue == true)) {
+            if ((Original_ew.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_swa.Value));
+                this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_ew.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
             }
-            if ((Original_ewa.HasValue == true)) {
+            if ((Original_swa.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_ewa.Value));
+                this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_swa.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
             }
-            if ((Original_progress.HasValue == true)) {
+            if ((Original_ewa.HasValue == true)) {
                 this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_progress.Value));
+                this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_ewa.Value));
             }
             else {
                 this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
                 this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
             }
+            if ((Original_progress.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_progress.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
+            }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[35].Value = ((System.DateTime)(Original_wdate));
             if ((Original_uid == null)) {
-                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_uid));
+                this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid));
             }
-            this.Adapter.UpdateCommand.Parameters[36].Value = ((int)(idx));
+            if ((Original_appoval.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_appoval.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value;
+            }
+            if ((Original_no.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[41].Value = ((int)(Original_no.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value;
+            }
+            this.Adapter.UpdateCommand.Parameters[42].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)) {
@@ -33459,6 +33630,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                     string wuid, 
                     System.DateTime wdate, 
                     string uid, 
+                    global::System.Nullable<int> appoval, 
+                    global::System.Nullable<int> no, 
                     int Original_idx, 
                     string Original_gcode, 
                     global::System.Nullable<int> Original_project, 
@@ -33471,8 +33644,10 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                     global::System.Nullable<int> Original_progress, 
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
-                    string Original_uid) {
+                    string Original_uid, 
-            return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_uid, Original_idx);
+                    global::System.Nullable<int> Original_appoval, 
+                    global::System.Nullable<int> Original_no) {
+            return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_uid, Original_appoval, Original_no, Original_idx);
         }
     }
     

SubProject/FPJ0000/dsPRJ.xsd

@@ -2440,7 +2440,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_ProjectsSchedule" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)))</CommandText>
+                    <CommandText>DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -2465,13 +2465,17 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid);
+                    <CommandText>INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid], [appoval], [no]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid, @appoval, @no);
-SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq</CommandText>
+SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2486,25 +2490,28 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid
+                    <CommandText>SELECT  idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no
 FROM     EETGW_ProjectsSchedule
-WHERE  (gcode = @gcode) AND (project = @project)
+WHERE  (gcode = @gcode) AND (project = @project) AND (no = @no)
 ORDER BY seq</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_ProjectsSchedule" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="EE.dbo.EETGW_ProjectsSchedule" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="no" ColumnName="no" DataSourceName="EE.dbo.EETGW_ProjectsSchedule" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@no" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="no" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)));
+                    <CommandText>UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid, [appoval] = @appoval, [no] = @no WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)));
-SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq</CommandText>
+SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2519,6 +2526,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -2542,7 +2551,11 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_uid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_uid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_ProjectsSchedule" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_appoval" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="appoval" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_no" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="no" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -2563,6 +2576,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="uid" DataSetColumn="uid" />
+              <Mapping SourceColumn="appoval" DataSetColumn="appoval" />
+              <Mapping SourceColumn="no" DataSetColumn="no" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -2615,7 +2630,7 @@ WHERE  (idx = @idx)</CommandText>
   <xs:element name="dsPRJ" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPRJ" msprop:Generator_UserDSName="dsPRJ">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
+        <xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2882,7 +2897,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_RowClassName="ProjectsIOMapRow" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent">
+        <xs:element name="ProjectsIOMap" msprop:Generator_TableClassName="ProjectsIOMapDataTable" msprop:Generator_TableVarName="tableProjectsIOMap" msprop:Generator_TablePropName="ProjectsIOMap" msprop:Generator_RowDeletingName="ProjectsIOMapRowDeleting" msprop:Generator_RowChangingName="ProjectsIOMapRowChanging" msprop:Generator_RowEvHandlerName="ProjectsIOMapRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsIOMapRowDeleted" msprop:Generator_UserTableName="ProjectsIOMap" msprop:Generator_RowChangedName="ProjectsIOMapRowChanged" msprop:Generator_RowEvArgName="ProjectsIOMapRowChangeEvent" msprop:Generator_RowClassName="ProjectsIOMapRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2926,7 +2941,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_RowClassName="ProjectsMailListRow" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent">
+        <xs:element name="ProjectsMailList" msprop:Generator_TableClassName="ProjectsMailListDataTable" msprop:Generator_TableVarName="tableProjectsMailList" msprop:Generator_TablePropName="ProjectsMailList" msprop:Generator_RowDeletingName="ProjectsMailListRowDeleting" msprop:Generator_RowChangingName="ProjectsMailListRowChanging" msprop:Generator_RowEvHandlerName="ProjectsMailListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsMailListRowDeleted" msprop:Generator_UserTableName="ProjectsMailList" msprop:Generator_RowChangedName="ProjectsMailListRowChanged" msprop:Generator_RowEvArgName="ProjectsMailListRowChangeEvent" msprop:Generator_RowClassName="ProjectsMailListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -2971,7 +2986,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_RowClassName="ProjectsPartRow" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent">
+        <xs:element name="ProjectsPart" msprop:Generator_TableClassName="ProjectsPartDataTable" msprop:Generator_TableVarName="tableProjectsPart" msprop:Generator_TablePropName="ProjectsPart" msprop:Generator_RowDeletingName="ProjectsPartRowDeleting" msprop:Generator_RowChangingName="ProjectsPartRowChanging" msprop:Generator_RowEvHandlerName="ProjectsPartRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsPartRowDeleted" msprop:Generator_UserTableName="ProjectsPart" msprop:Generator_RowChangedName="ProjectsPartRowChanged" msprop:Generator_RowEvArgName="ProjectsPartRowChangeEvent" msprop:Generator_RowClassName="ProjectsPartRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3087,7 +3102,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent">
+        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3212,7 +3227,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_RowClassName="ProjectsHistoryRow" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent">
+        <xs:element name="ProjectsHistory" msprop:Generator_TableClassName="ProjectsHistoryDataTable" msprop:Generator_TableVarName="tableProjectsHistory" msprop:Generator_TablePropName="ProjectsHistory" msprop:Generator_RowDeletingName="ProjectsHistoryRowDeleting" msprop:Generator_RowChangingName="ProjectsHistoryRowChanging" msprop:Generator_RowEvHandlerName="ProjectsHistoryRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsHistoryRowDeleted" msprop:Generator_UserTableName="ProjectsHistory" msprop:Generator_RowChangedName="ProjectsHistoryRowChanged" msprop:Generator_RowEvArgName="ProjectsHistoryRowChangeEvent" msprop:Generator_RowClassName="ProjectsHistoryRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3250,7 +3265,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent">
+        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -3366,7 +3381,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent" msprop:Generator_RowClassName="EETGW_NoteRow">
+        <xs:element name="EETGW_Note" msprop:Generator_TableClassName="EETGW_NoteDataTable" msprop:Generator_TableVarName="tableEETGW_Note" msprop:Generator_RowChangedName="EETGW_NoteRowChanged" msprop:Generator_TablePropName="EETGW_Note" msprop:Generator_RowDeletingName="EETGW_NoteRowDeleting" msprop:Generator_RowChangingName="EETGW_NoteRowChanging" msprop:Generator_RowEvHandlerName="EETGW_NoteRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_NoteRowDeleted" msprop:Generator_RowClassName="EETGW_NoteRow" msprop:Generator_UserTableName="EETGW_Note" msprop:Generator_RowEvArgName="EETGW_NoteRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3417,7 +3432,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_RowClassName="SCTableRow" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowEvArgName="SCTableRowChangeEvent">
+        <xs:element name="SCTable" msprop:Generator_TableClassName="SCTableDataTable" msprop:Generator_TableVarName="tableSCTable" msprop:Generator_TablePropName="SCTable" msprop:Generator_RowDeletingName="SCTableRowDeleting" msprop:Generator_RowChangingName="SCTableRowChanging" msprop:Generator_RowEvHandlerName="SCTableRowChangeEventHandler" msprop:Generator_RowDeletedName="SCTableRowDeleted" msprop:Generator_UserTableName="SCTable" msprop:Generator_RowChangedName="SCTableRowChanged" msprop:Generator_RowEvArgName="SCTableRowChangeEvent" msprop:Generator_RowClassName="SCTableRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3430,7 +3445,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_RowClassName="EETGW_SaveCostRow" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent">
+        <xs:element name="EETGW_SaveCost" msprop:Generator_TableClassName="EETGW_SaveCostDataTable" msprop:Generator_TableVarName="tableEETGW_SaveCost" msprop:Generator_TablePropName="EETGW_SaveCost" msprop:Generator_RowDeletingName="EETGW_SaveCostRowDeleting" msprop:Generator_RowChangingName="EETGW_SaveCostRowChanging" msprop:Generator_RowEvHandlerName="EETGW_SaveCostRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_SaveCostRowDeleted" msprop:Generator_UserTableName="EETGW_SaveCost" msprop:Generator_RowChangedName="EETGW_SaveCostRowChanged" msprop:Generator_RowEvArgName="EETGW_SaveCostRowChangeEvent" msprop:Generator_RowClassName="EETGW_SaveCostRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3600,7 +3615,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent" msprop:Generator_RowClassName="ProjectPartStatusRow">
+        <xs:element name="ProjectPartStatus" msprop:Generator_TableClassName="ProjectPartStatusDataTable" msprop:Generator_TableVarName="tableProjectPartStatus" msprop:Generator_RowChangedName="ProjectPartStatusRowChanged" msprop:Generator_TablePropName="ProjectPartStatus" msprop:Generator_RowDeletingName="ProjectPartStatusRowDeleting" msprop:Generator_RowChangingName="ProjectPartStatusRowChanging" msprop:Generator_RowEvHandlerName="ProjectPartStatusRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectPartStatusRowDeleted" msprop:Generator_RowClassName="ProjectPartStatusRow" msprop:Generator_UserTableName="ProjectPartStatus" msprop:Generator_RowEvArgName="ProjectPartStatusRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -3777,7 +3792,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow">
+        <xs:element name="EETGW_ProjecthistoryD" msprop:Generator_TableClassName="EETGW_ProjecthistoryDDataTable" msprop:Generator_TableVarName="tableEETGW_ProjecthistoryD" msprop:Generator_RowChangedName="EETGW_ProjecthistoryDRowChanged" msprop:Generator_TablePropName="EETGW_ProjecthistoryD" msprop:Generator_RowDeletingName="EETGW_ProjecthistoryDRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjecthistoryDRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjecthistoryDRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjecthistoryDRowDeleted" msprop:Generator_RowClassName="EETGW_ProjecthistoryDRow" msprop:Generator_UserTableName="EETGW_ProjecthistoryD" msprop:Generator_RowEvArgName="EETGW_ProjecthistoryDRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3822,7 +3837,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectToDoRow" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent">
+        <xs:element name="EETGW_ProjectToDo" msprop:Generator_TableClassName="EETGW_ProjectToDoDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectToDo" msprop:Generator_TablePropName="EETGW_ProjectToDo" msprop:Generator_RowDeletingName="EETGW_ProjectToDoRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectToDoRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectToDoRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectToDoRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectToDo" msprop:Generator_RowChangedName="EETGW_ProjectToDoRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectToDoRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectToDoRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -3891,7 +3906,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow">
+        <xs:element name="EETGW_JobReport_EBoard" msprop:Generator_TableClassName="EETGW_JobReport_EBoardDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_EBoard" msprop:Generator_RowChangedName="EETGW_JobReport_EBoardRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_EBoard" msprop:Generator_RowDeletingName="EETGW_JobReport_EBoardRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_EBoardRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_EBoardRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_EBoardRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_EBoardRow" msprop:Generator_UserTableName="EETGW_JobReport_EBoard" msprop:Generator_RowEvArgName="EETGW_JobReport_EBoardRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -4081,7 +4096,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow">
+        <xs:element name="EETGW_JobReport_AutoInput" msprop:Generator_TableClassName="EETGW_JobReport_AutoInputDataTable" msprop:Generator_TableVarName="tableEETGW_JobReport_AutoInput" msprop:Generator_RowChangedName="EETGW_JobReport_AutoInputRowChanged" msprop:Generator_TablePropName="EETGW_JobReport_AutoInput" msprop:Generator_RowDeletingName="EETGW_JobReport_AutoInputRowDeleting" msprop:Generator_RowChangingName="EETGW_JobReport_AutoInputRowChanging" msprop:Generator_RowEvHandlerName="EETGW_JobReport_AutoInputRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_JobReport_AutoInputRowDeleted" msprop:Generator_RowClassName="EETGW_JobReport_AutoInputRow" msprop:Generator_UserTableName="EETGW_JobReport_AutoInput" msprop:Generator_RowEvArgName="EETGW_JobReport_AutoInputRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -4220,7 +4235,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent">
+        <xs:element name="EETGW_ProjectsSchedule" msprop:Generator_TableClassName="EETGW_ProjectsScheduleDataTable" msprop:Generator_TableVarName="tableEETGW_ProjectsSchedule" msprop:Generator_TablePropName="EETGW_ProjectsSchedule" msprop:Generator_RowDeletingName="EETGW_ProjectsScheduleRowDeleting" msprop:Generator_RowChangingName="EETGW_ProjectsScheduleRowChanging" msprop:Generator_RowEvHandlerName="EETGW_ProjectsScheduleRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_ProjectsScheduleRowDeleted" msprop:Generator_UserTableName="EETGW_ProjectsSchedule" msprop:Generator_RowChangedName="EETGW_ProjectsScheduleRowChanged" msprop:Generator_RowEvArgName="EETGW_ProjectsScheduleRowChangeEvent" msprop:Generator_RowClassName="EETGW_ProjectsScheduleRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -4267,6 +4282,8 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="appoval" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="appoval" msprop:Generator_ColumnVarNameInTable="columnappoval" msprop:Generator_ColumnPropNameInTable="appovalColumn" msprop:Generator_UserColumnName="appoval" type="xs:int" minOccurs="0" />
+              <xs:element name="no" msprop:nullValue="1" msprop:Generator_ColumnPropNameInRow="no" msprop:Generator_ColumnVarNameInTable="columnno" msprop:Generator_ColumnPropNameInTable="noColumn" msprop:Generator_UserColumnName="no" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

SubProject/FPJ0000/dsPRJ.xss

@@ -4,15 +4,15 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1088" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="653" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Projects" ZOrder="1" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Projects" ZOrder="2" X="189" Y="59" Height="381" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ProjectsIOMap" ZOrder="4" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:ProjectsIOMap" ZOrder="1" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:ProjectsMailList" ZOrder="17" X="667" Y="70" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:ProjectsPart" ZOrder="10" X="973" Y="68" Height="343" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:JobReport" ZOrder="16" X="1259" Y="67" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ProjectsHistory" ZOrder="15" X="1943" Y="70" Height="267" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:SPMaster" ZOrder="3" X="476" Y="366" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SPMaster" ZOrder="4" X="476" Y="366" Height="305" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_Note" ZOrder="12" X="810" Y="455" Height="248" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:EETGW_SaveCost" ZOrder="6" X="253" Y="522" Height="305" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ProjectPartStatus" ZOrder="13" X="1105" Y="466" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -20,7 +20,7 @@
     <Shape ID="DesignTable:EETGW_ProjectToDo" ZOrder="7" X="56" Y="624" Height="305" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_JobReport_EBoard" ZOrder="9" X="33" Y="19" Height="324" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:EETGW_JobReport_AutoInput" ZOrder="11" X="702" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="2" X="1647" Y="151" Height="305" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="3" X="1647" Y="151" Height="305" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:SCTable" ZOrder="5" X="393" Y="400" Height="144" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="14" X="2264" Y="160" Height="86" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
   </Shapes>