장비목록 통합작업

Project/Properties/AssemblyInfo.cs

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

Project/_Management/fLineCode.Designer.cs

@@ -54,6 +54,7 @@
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grp2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -146,6 +147,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -200,6 +202,7 @@
             this.dataGridViewTextBoxColumn3,
             this.dataGridViewTextBoxColumn4,
             this.plant,
+            this.grp2,
             this.except,
             this.dataGridViewTextBoxColumn5});
             this.dv.DataSource = this.bs;
@@ -276,6 +279,12 @@
             this.plant.HeaderText = "plant";
             this.plant.Name = "plant";
             // 
+            // grp2
+            // 
+            this.grp2.DataPropertyName = "grp2";
+            this.grp2.HeaderText = "grp2";
+            this.grp2.Name = "grp2";
+            // 
             // except
             // 
             this.except.DataPropertyName = "except";
@@ -336,6 +345,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.DataGridViewTextBoxColumn plant;
+        private System.Windows.Forms.DataGridViewTextBoxColumn grp2;
         private System.Windows.Forms.DataGridViewCheckBoxColumn except;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
     }

Project/_Management/fLineCode.resx

@@ -201,6 +201,9 @@
   <metadata name="plant.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="grp2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Project/dsMSSQL.Designer.cs

@@ -2450,6 +2450,8 @@ namespace Project {
             
             private global::System.Data.DataColumn columnplant;
             
+            private global::System.Data.DataColumn columngrp2;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public LineCodeDataTable() {
@@ -2555,6 +2557,14 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn grp2Column {
+                get {
+                    return this.columngrp2;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2592,7 +2602,7 @@ namespace Project {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public LineCodeRow AddLineCodeRow(string code, string team, string part, string memo, string wuid, System.DateTime wdate, bool except, string plant) {
+            public LineCodeRow AddLineCodeRow(string code, string team, string part, string memo, string wuid, System.DateTime wdate, bool except, string plant, string grp2) {
                 LineCodeRow rowLineCodeRow = ((LineCodeRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -2603,7 +2613,8 @@ namespace Project {
                         wuid,
                         wdate,
                         except,
-                        plant};
+                        plant,
+                        grp2};
                 rowLineCodeRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowLineCodeRow);
                 return rowLineCodeRow;
@@ -2642,6 +2653,7 @@ namespace Project {
                 this.columnwdate = base.Columns["wdate"];
                 this.columnexcept = base.Columns["except"];
                 this.columnplant = base.Columns["plant"];
+                this.columngrp2 = base.Columns["grp2"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2665,6 +2677,8 @@ namespace Project {
                 base.Columns.Add(this.columnexcept);
                 this.columnplant = new global::System.Data.DataColumn("plant", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnplant);
+                this.columngrp2 = new global::System.Data.DataColumn("grp2", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columngrp2);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -2681,6 +2695,7 @@ namespace Project {
                 this.columnwuid.MaxLength = 20;
                 this.columnwdate.AllowDBNull = false;
                 this.columnplant.MaxLength = 10;
+                this.columngrp2.MaxLength = 20;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6251,6 +6266,22 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string grp2 {
+                get {
+                    if (this.Isgrp2Null()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableLineCode.grp2Column]));
+                    }
+                }
+                set {
+                    this[this.tableLineCode.grp2Column] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IscodeNull() {
@@ -6322,6 +6353,18 @@ namespace Project {
             public void SetplantNull() {
                 this[this.tableLineCode.plantColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool Isgrp2Null() {
+                return this.IsNull(this.tableLineCode.grp2Column);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void Setgrp2Null() {
+                this[this.tableLineCode.grp2Column] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -11446,10 +11489,11 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj
             tableMapping.ColumnMappings.Add("wdate", "wdate");
             tableMapping.ColumnMappings.Add("except", "except");
             tableMapping.ColumnMappings.Add("plant", "plant");
+            tableMapping.ColumnMappings.Add("grp2", "grp2");
             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 [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)))";
             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_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -11466,10 +11510,12 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj
             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_plant", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_plant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", 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 [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant);
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant], [grp2]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant, @grp2);
-SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode WHERE (idx = SCOPE_IDENTITY())";
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM LineCode WHERE (idx = SCOPE_IDENTITY())";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@team", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "team", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -11479,10 +11525,11 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             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("@plant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", 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 [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [plant] = @plant WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)));
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [plant] = @plant, [grp2] = @grp2 WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)));
-SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode WHERE (idx = @idx)";
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM LineCode WHERE (idx = @idx)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@team", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "team", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -11492,6 +11539,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             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("@plant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", 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_code", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -11507,6 +11555,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             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_plant", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_plant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "plant", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grp2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp2", 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, "", "", ""));
         }
         
@@ -11523,8 +11573,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             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, code, team, part, [except], memo, wuid, wdate, plant\r\nFROM     LineC" +
+            this._commandCollection[0].CommandText = "SELECT  idx, code, team, part, [except], memo, wuid, wdate, plant, grp2\r\nFROM    " +
-                "ode";
+                " LineCode";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
         }
         
@@ -11585,7 +11635,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
         [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_code, string Original_team, string Original_part, global::System.Nullable<bool> Original_except, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_plant) {
+        public virtual int Delete(int Original_idx, string Original_code, string Original_team, string Original_part, global::System.Nullable<bool> Original_except, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_plant, string Original_grp2) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_code == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -11642,6 +11692,14 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                 this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_plant));
             }
+            if ((Original_grp2 == null)) {
+                this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_grp2));
+            }
             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)) {
@@ -11662,7 +11720,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
         [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 code, string team, string part, global::System.Nullable<bool> except, string memo, string wuid, System.DateTime wdate, string plant) {
+        public virtual int Insert(string code, string team, string part, global::System.Nullable<bool> except, string memo, string wuid, System.DateTime wdate, string plant, string grp2) {
             if ((code == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -11706,6 +11764,12 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             else {
                 this.Adapter.InsertCommand.Parameters[7].Value = ((string)(plant));
             }
+            if ((grp2 == null)) {
+                this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[8].Value = ((string)(grp2));
+            }
             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)) {
@@ -11735,6 +11799,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                     string wuid, 
                     System.DateTime wdate, 
                     string plant, 
+                    string grp2, 
                     int Original_idx, 
                     string Original_code, 
                     string Original_team, 
@@ -11744,6 +11809,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
                     string Original_plant, 
+                    string Original_grp2, 
                     int idx) {
             if ((code == null)) {
                 this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -11788,63 +11854,77 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
             else {
                 this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(plant));
             }
-            this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx));
+            if ((grp2 == null)) {
-            if ((Original_code == null)) {
+                this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
-                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[8].Value = ((string)(grp2));
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_code));
+            }
+            this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx));
+            if ((Original_code == null)) {
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_code));
             }
             if ((Original_team == null)) {
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_team));
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_team));
             }
             if ((Original_part == null)) {
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_part));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_part));
             }
             if ((Original_except.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_except.Value));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((bool)(Original_except.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
             }
             if ((Original_memo == null)) {
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_memo));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_memo));
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(Original_wdate));
             if ((Original_plant == null)) {
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_plant));
+                this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_plant));
             }
-            this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(idx));
+            if ((Original_grp2 == null)) {
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_grp2));
+            }
+            this.Adapter.UpdateCommand.Parameters[26].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)) {
@@ -11874,6 +11954,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                     string wuid, 
                     System.DateTime wdate, 
                     string plant, 
+                    string grp2, 
                     int Original_idx, 
                     string Original_code, 
                     string Original_team, 
@@ -11882,8 +11963,9 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                     string Original_memo, 
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
-                    string Original_plant) {
+                    string Original_plant, 
-            return this.Update(code, team, part, except, memo, wuid, wdate, plant, Original_idx, Original_code, Original_team, Original_part, Original_except, Original_memo, Original_wuid, Original_wdate, Original_plant, Original_idx);
+                    string Original_grp2) {
+            return this.Update(code, team, part, except, memo, wuid, wdate, plant, grp2, Original_idx, Original_code, Original_team, Original_part, Original_except, Original_memo, Original_wuid, Original_wdate, Original_plant, Original_grp2, Original_idx);
         }
     }
     

Project/dsMSSQL.xsd

@@ -591,7 +591,7 @@ ORDER BY pdate</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.LineCode" 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 [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)))</CommandText>
+                    <CommandText>DELETE FROM [LineCode] WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)))</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_code" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -608,13 +608,15 @@ ORDER BY pdate</CommandText>
                       <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_plant" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp2" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_grp2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp2" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant);
+                    <CommandText>INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant], [grp2]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant, @grp2);
-SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode WHERE (idx = SCOPE_IDENTITY())</CommandText>
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM LineCode WHERE (idx = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@team" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="team" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -624,20 +626,21 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                       <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="@plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp2" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, code, team, part, [except], memo, wuid, wdate, plant
+                    <CommandText>SELECT  idx, code, team, part, [except], memo, wuid, wdate, plant, grp2
 FROM     LineCode</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [plant] = @plant WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)));
+                    <CommandText>UPDATE [LineCode] SET [code] = @code, [team] = @team, [part] = @part, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [plant] = @plant, [grp2] = @grp2 WHERE (([idx] = @Original_idx) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_team = 1 AND [team] IS NULL) OR ([team] = @Original_team)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_plant = 1 AND [plant] IS NULL) OR ([plant] = @Original_plant)) AND ((@IsNull_grp2 = 1 AND [grp2] IS NULL) OR ([grp2] = @Original_grp2)));
-SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode WHERE (idx = @idx)</CommandText>
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM LineCode WHERE (idx = @idx)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@team" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="team" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -647,6 +650,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                       <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="@plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp2" 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_code" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_code" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="code" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -662,6 +666,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
                       <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_plant" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp2" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_grp2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp2" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.LineCode" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
@@ -678,6 +684,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode W
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="except" DataSetColumn="except" />
               <Mapping SourceColumn="plant" DataSetColumn="plant" />
+              <Mapping SourceColumn="grp2" DataSetColumn="grp2" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -1142,7 +1149,7 @@ WHERE  (idx = @idx)</CommandText>
   <xs:element name="dsMSSQL" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsMSSQL" msprop:Generator_UserDSName="dsMSSQL">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <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">
@@ -1283,7 +1290,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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" />
@@ -1354,7 +1361,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_UserTableName="Items" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_RowEvArgName="ItemsRowChangeEvent" msprop:Generator_RowClassName="ItemsRow">
+        <xs:element name="Items" msprop:Generator_TableClassName="ItemsDataTable" msprop:Generator_TableVarName="tableItems" msprop:Generator_RowChangedName="ItemsRowChanged" msprop:Generator_TablePropName="Items" msprop:Generator_RowDeletingName="ItemsRowDeleting" msprop:Generator_RowChangingName="ItemsRowChanging" msprop:Generator_RowEvHandlerName="ItemsRowChangeEventHandler" msprop:Generator_RowDeletedName="ItemsRowDeleted" msprop:Generator_RowClassName="ItemsRow" msprop:Generator_UserTableName="Items" msprop:Generator_RowEvArgName="ItemsRowChangeEvent">
           <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" />
@@ -1412,7 +1419,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_RowEvArgName="InventoryRowChangeEvent" msprop:Generator_RowClassName="InventoryRow">
+        <xs:element name="Inventory" msprop:Generator_TableClassName="InventoryDataTable" msprop:Generator_TableVarName="tableInventory" msprop:Generator_RowChangedName="InventoryRowChanged" msprop:Generator_TablePropName="Inventory" msprop:Generator_RowDeletingName="InventoryRowDeleting" msprop:Generator_RowChangingName="InventoryRowChanging" msprop:Generator_RowEvHandlerName="InventoryRowChangeEventHandler" msprop:Generator_RowDeletedName="InventoryRowDeleted" msprop:Generator_RowClassName="InventoryRow" msprop:Generator_UserTableName="Inventory" msprop:Generator_RowEvArgName="InventoryRowChangeEvent">
           <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" />
@@ -1482,7 +1489,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent" msprop:Generator_RowClassName="LineCodeRow">
+        <xs:element name="LineCode" msprop:Generator_TableClassName="LineCodeDataTable" msprop:Generator_TableVarName="tableLineCode" msprop:Generator_RowChangedName="LineCodeRowChanged" msprop:Generator_TablePropName="LineCode" msprop:Generator_RowDeletingName="LineCodeRowDeleting" msprop:Generator_RowChangingName="LineCodeRowChanging" msprop:Generator_RowEvHandlerName="LineCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="LineCodeRowDeleted" msprop:Generator_RowClassName="LineCodeRow" msprop:Generator_UserTableName="LineCode" msprop:Generator_RowEvArgName="LineCodeRowChangeEvent">
           <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" />
@@ -1530,10 +1537,17 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="grp2" msprop:Generator_ColumnVarNameInTable="columngrp2" msprop:Generator_ColumnPropNameInRow="grp2" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="grp2Column" msprop:Generator_UserColumnName="grp2" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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">
@@ -1562,7 +1576,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_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: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: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" />
@@ -1678,7 +1692,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="EETGW_GroupUser" msprop:Generator_TableClassName="EETGW_GroupUserDataTable" msprop:Generator_TableVarName="tableEETGW_GroupUser" msprop:Generator_TablePropName="EETGW_GroupUser" msprop:Generator_RowDeletingName="EETGW_GroupUserRowDeleting" msprop:Generator_RowChangingName="EETGW_GroupUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_GroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_GroupUserRowDeleted" msprop:Generator_UserTableName="EETGW_GroupUser" msprop:Generator_RowChangedName="EETGW_GroupUserRowChanged" msprop:Generator_RowEvArgName="EETGW_GroupUserRowChangeEvent" msprop:Generator_RowClassName="EETGW_GroupUserRow">
+        <xs:element name="EETGW_GroupUser" msprop:Generator_TableClassName="EETGW_GroupUserDataTable" msprop:Generator_TableVarName="tableEETGW_GroupUser" msprop:Generator_RowChangedName="EETGW_GroupUserRowChanged" msprop:Generator_TablePropName="EETGW_GroupUser" msprop:Generator_RowDeletingName="EETGW_GroupUserRowDeleting" msprop:Generator_RowChangingName="EETGW_GroupUserRowChanging" msprop:Generator_RowEvHandlerName="EETGW_GroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_GroupUserRowDeleted" msprop:Generator_RowClassName="EETGW_GroupUserRow" msprop:Generator_UserTableName="EETGW_GroupUser" msprop:Generator_RowEvArgName="EETGW_GroupUserRowChangeEvent">
           <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" />
@@ -1717,7 +1731,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_RowClassName="vGroupUserRow" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent">
+        <xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent" msprop:Generator_RowClassName="vGroupUserRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">

Project/dsMSSQL.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-21" 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="-8" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Users" ZOrder="5" X="998" Y="60" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
     <Shape ID="DesignTable:Projects" ZOrder="10" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />

Project/fMain.Designer.cs

@@ -73,6 +73,8 @@
             this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.잉여장비ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.otherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.summaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aLLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
             this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.휴가관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -121,7 +123,6 @@
             this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.summaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -440,6 +441,7 @@
             this.잉여장비ToolStripMenuItem,
             this.otherToolStripMenuItem,
             this.summaryToolStripMenuItem,
+            this.aLLToolStripMenuItem,
             this.toolStripMenuItem2,
             this.라인코드관리ToolStripMenuItem});
             this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
@@ -449,6 +451,7 @@
             // 
             // dataFOLToolStripMenuItem
             // 
+            this.dataFOLToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.dataFOLToolStripMenuItem.Name = "dataFOLToolStripMenuItem";
             this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataFOLToolStripMenuItem.Text = "FOL";
@@ -456,6 +459,7 @@
             // 
             // dataMoldEOLToolStripMenuItem
             // 
+            this.dataMoldEOLToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.dataMoldEOLToolStripMenuItem.Name = "dataMoldEOLToolStripMenuItem";
             this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataMoldEOLToolStripMenuItem.Text = "MOLD & EOL";
@@ -463,6 +467,7 @@
             // 
             // dataToolStripMenuItem
             // 
+            this.dataToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
             this.dataToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataToolStripMenuItem.Text = "BUMP";
@@ -470,6 +475,7 @@
             // 
             // 잉여장비ToolStripMenuItem
             // 
+            this.잉여장비ToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.잉여장비ToolStripMenuItem.Name = "잉여장비ToolStripMenuItem";
             this.잉여장비ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.잉여장비ToolStripMenuItem.Text = "잉여장비";
@@ -477,11 +483,27 @@
             // 
             // otherToolStripMenuItem
             // 
+            this.otherToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
             this.otherToolStripMenuItem.Name = "otherToolStripMenuItem";
             this.otherToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.otherToolStripMenuItem.Text = "K3/K5";
             this.otherToolStripMenuItem.Click += new System.EventHandler(this.otherToolStripMenuItem_Click);
             // 
+            // summaryToolStripMenuItem
+            // 
+            this.summaryToolStripMenuItem.ForeColor = System.Drawing.Color.Gray;
+            this.summaryToolStripMenuItem.Name = "summaryToolStripMenuItem";
+            this.summaryToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.summaryToolStripMenuItem.Text = "Summary";
+            this.summaryToolStripMenuItem.Click += new System.EventHandler(this.summaryToolStripMenuItem_Click);
+            // 
+            // aLLToolStripMenuItem
+            // 
+            this.aLLToolStripMenuItem.Name = "aLLToolStripMenuItem";
+            this.aLLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.aLLToolStripMenuItem.Text = "ALL";
+            this.aLLToolStripMenuItem.Click += new System.EventHandler(this.aLLToolStripMenuItem_Click);
+            // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
@@ -904,13 +926,6 @@
             this.toolStripButton2.Text = "품목정보";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
             // 
-            // summaryToolStripMenuItem
-            // 
-            this.summaryToolStripMenuItem.Name = "summaryToolStripMenuItem";
-            this.summaryToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.summaryToolStripMenuItem.Text = "Summary";
-            this.summaryToolStripMenuItem.Click += new System.EventHandler(this.summaryToolStripMenuItem_Click);
-            // 
             // fMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1035,6 +1050,7 @@
         private System.Windows.Forms.ToolStripMenuItem accessDBToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem otherToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem summaryToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem aLLToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -1171,5 +1171,12 @@ namespace Project
             if (!ShowForm(formkey))
                 AddForm(formkey, new FEQ0000.fEquipmentSummary(), "장비전체요약");
         }
+
+        private void aLLToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "EQALL";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.ALL), "ALL");
+        }
     }
 }

Project/fMain.resx

@@ -374,53 +374,53 @@
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPvS1NhGH1B71/Qx/6HPqQrIYKEsDIVoiih
-        QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQYgTUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z
+        IYmLQihH1lY0dUK0QfhBSE1kX5wyUGoUgXUZjBD6HUWsGe3bgmBTR2zz7t5pnd7z3itLVPCByz7ce55z
-        nnPO1P9OzlC+r4aal9+iPHbaUL9nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn
+        nnPOxF4nownPD00syt+8fKykJv7ENfHXeb37yI8n0prIEZDrOY9l/1WsDF7HatAL+Q7OZ9tHsrmX6kU2
-        W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss
+        23QAy74rKNzzojjmQzFwFGuhJqwvDKDi32VBpk5EUpowcpc7UQj14/edFhhhF6yxw6hO2M9GYhDW3R0W
-        yDWpaZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg
+        ZOrFvJRWXRm4huJDH8rBg6g6QGv2GMyX7ai8vQArO47Sh4atC8hM8OpQH0pTfpgjLhsYa0bl1VkYqS4Y
-        fjmtH/v7OCrvPY0FvJmyyUywPbxTg60nHTA/ejXoW8aLhy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn
+        37vVY/2aROmTq7aAN1M2mQm2Rg8psPm8FcYXtwL9TLnx+E0HAolmjH8ewv7IfyfQMN5M2ZvMpt4BI30J
-        sCLg6Rdd8M3tRsfjFuyfbUb0XQhbJ9wFjIqZlm5dQvVGS4NZwMXPPbid3odOF3gyHkDfeALx5CccujLj
+        axI8/7odnoUjaH3WiBNPGxD+GMC+KWcBo2Kmhfs3UB5urDFLcP5bFx4kj6PNAV6M+tA7GUNU/4rTt+L2
-        LGDOjKoau6oN482UTWaCDwjw8IOj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv
+        AubMqMqR28ow3kzZZCb4pASemTuH3kcxzOhpzOpLmH6RthdIdg9LwpwZFdmVYY5sMhMcjCYUMDzzHj0h
-        JCnguHWwf+Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/KhdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw
+        XYKj5qn++Duat8iGsSTMmVHRbRrGmymbzAR7R5MK2HbzSYuSzpEK8qwnG6ZulzmTnW7TMN5M2WQm2IHV
-        xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm
+        Ri6w2G3WU8mXJeECRqXYpWFkp+wtzJvD+/nHYLdVPWXDWBLmzKjotm3YDuwcxidVqD8Gu816smEsCXOm
-        03y0YetGqb9hx/RWhn9qhQAAAABJRU5ErkJggg==
+        03yUYdtGiH9Vo/RQZzaIAAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKTSURBVDhPlVJRSFNRGL5PEVE91Us99aTWU0S3iCJK0N6i
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Us99RBpPUV0iyiEBO0t
-        hxAqGgy2hlPadIri5ly4Nadjd7q55XRymVdqM5sOQmUPbjqX00J0oEwwRd96EgYhW32dc7yJUlF9cLjw
+        egihosFgazilTacobs6FW3M6dqebW04nl3mlNrPpIFT24KZzOS1EB8oEU/StJ2EQstXXOcebKBXVB4cL
-        nfv9//f9/+H+hOfSLWhD1/A4UIY7vgvfZPrfoRgsKUQ/9eJNRsBt9/n/L/BMvIK3Hz2QPjhR7joLmeZC
+        37nf/3/f/x/uT3gu3YE2dAOPA6Uo8134JtP/DsXgxUL0Uy/eZASUuc//f4Fn4jW8/eiB9MGJctdZyDQX
-        oRCCwSD6+vrg9XqfcKlUCvTMzMxgenoaeukuqsWbML57iNcLAoIpO54O3sBV22lcajvF/i0UCtjZ2YEg
+        CoUQDAbR19cHr9f7hEulUqBnZmYG09PT0Et3US3ehvHdQ7xeEBBM2fF08Bau207jStsp9m+hUMDOzg4E
-        CFludnYWxWIRe3t77KgGL8MSe4TwghtC3ADr+2r0JtqgEMtx0XymuLu7i7W1NXR2dn7u6Oio5pLJJCO2
+        Qchys7OzKBaL2NvbY0c1eBWW2COEF9wQ4gZY31ejN9EGhViOy+Yzxd3dXaytraGzs/NzR0dHNZdMJhmx
-        t7eRTqextbWFKn8pDJH7ENMO+JIvoAxVEFdVGBkZQTabRSQSARGXy6k4Lh6PY25uDrFYjE8kEhgdHeUr
+        vb2NdDqNra0tVPlLYIjch5h2wJd8AWWogriqwsjICLLZLCKRCIi4XE7FcfF4HHNzc4jFYnwikcDo6Chf
-        hXPQSBVQS/dQZjqRouLu7m5ekiSW32q1lspyjpuYmMDy8jKbwcbGBqamppBbz4F/eRwPvNcPOg8NDWFp
+        KZyDRqqAWrqHUtOJFBV3d3fzkiSx/FartUSWc9zExASWl5fZDDY2NjA1NYXceg78y+N44L150HloaAhL
-        aYl2h9lsPinL9xGNRpHP5zE5OQnShR8fH0cgEOCpXafTyVOx3W7n+/v70draerCVA4TDYWMmk0EulwMV
+        S0u0O8xm80lZvo9oNIp8Po/JyUmQLvz4+DgCgQBP7TqdTp6K7XY739/fj9bW1oOtHCAcDhszmQxyuRyo
-        r66ugnBYWVkBXR3tTApicXERTU1N32XZUYiiiIGBAfj9fvT09MDlcsHhcNC8sFgs1DbGxsZgMBh+X+Bv
+        eHV1FYTDysoK6OpoZ1IQi4uLaGpq+i7LjkIURQwMDMDv96OnpwculwsOh4PmhcViobYxNjYGg8Hw+wJ/
-        IAWO1dfXo6am5otM7YPkKnlF4PP56KRpZpoX7e3trGtLSwsaGxtRV1fHsms0mjwT/gRZi5F+3W63rqur
+        AylwrL6+HjU1NV9kah8k16VXBD6fj06aZqZ50d7ezrq2tLSgsbERdXV1LLtGo8kz4U+QtRjp1+1267q6
-        a5OIdeziEPR6va62tnZTq9Xq1Gr1V5neh8fjMZJnydY1Pz+P4eFhNunm5mY0NDSAiEEMsmdM3j8UCsW6
+        ujaJWMcuDkGv1+tqa2s3tVqtTq1Wf5XpfXg8HiN5lmxd8/PzGB4eZpNubm5GQ0MDiBjEIHvG5P1DoVCs
-        LD0Km83GhmUymX5xQGzrVCoVlErloRVy3A8sRMI1VOLCmwAAAABJRU5ErkJggg==
+        y9KjsNlsbFgmk+kXB8S2TqVSQalUHlohx/0AHQbCMeRxeLIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJtlGIZ7amJ2gGEVR382PUBQk0WXoNmy
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMVSURBVDhPfZNdTJNnGIZ7arLsgAU7Jv3R7QBhW2KmCS7z
-        qBkjCtuYHfIzOj4YlJYfnZ10WGTU0dIWWqD8FCguQ0sRVtboZHSKQ7IZE90SXZh1qc51wWkxGM9IyPSy
+        YFtEkoGKq4wfqX4glJafzdVRWRlSpaUttED5KVA04koZWtZsDqkbkxFdlmyabAbXmW7OGuYsC8vOSIh6
-        vOuSjRjv5D558tzX97zP+36ywUo16+2tUNMvqegtV9KjVdJVpsBVmo6zeBP2ok1YCx/jPU0arfsfRQD+
+        rbzWRMmyO7lPnjz39T3v876fbKBCzWp7y9X0SSp6Dijp1irpLFPgKk3HWbwOe9E6rIXPcUyTRsueZxGA
-        +Mr9377YydJ8B/ELTn7/zM7tczZ+PXuCxZCFW6dbaCmQC8Bi5MxR4vNWYhOFdz1+gJv+17hxqoCffXuI
+        v751/7cvdbAw2078opO7X9q5c97GH+eOMx+ycPtsM80FcgGYj3x6mPisldh44UOP7eWW/21unirgN99O
-        9r/K9e5cIs5dXGt7kR9dGn7xm2neKb+TAKhKpm27xRfDTduYPvYcprxUgke2Mt6wlVHDMwxXPy1qbm0m
+        on1vcaMrl4hzO9dbX+cXl4bf/WaatsnvJQCqkknbDvHFcOMWJo9sxpSXSvDQJsbqNzFieJmhqpdEza3N
-        9uIMvvc1EmzM4Z09Gwdka/JK6stXRqtZmHybqfonRPMHui2MVG5m4JCa7oMqUWvTKPnQcpBLzvJEOGXp
+        xF6cwU++BoINOXy4c22/bEVeSX3l6kgVc2c+YKLuBdF8WreB4Yr19O9X07VPJWqtGiUfW/Zx2XkgEU5Z
-        SM6GFAHokxTbx03Z3P68nVDT86J5qGIzvWUqOotV2AqVotaq2cK3/W/xvj6bxrxHSkT4nnq0irELrgN8
+        OJTzdIoA9EqK18ZM2dz5qo1Q41bRPFi+np4yFR3FKmyFSlFr0Wzgh773OaHPpiHvmRIRfqRurWL0omsv
-        7TMwN1jPjMfAJ916Qm49pztq+MihY9pVy8dNeZjyU79Mxu6qz5D58ICkDB0vU9zpfCX97/VXtbbt5r3y
+        3/kMzAzUMeUx8HmXnpBbz9n2aj5x6Jh01fBZYx6m/NRvkrGH6jVkPtUvKUNHyxT3OnLT76++qpVtN+2S
-        tTNzLD/1H8v+NHcyKpP5KtNTBiX1n8Hml5j36h7w3ICO2X4d53urOddTxdmuKqacEn11L9BaID8hAIOH
+        r5yZI/mpDyx70tzJqEzmq0hPGZDUfweb3mDWq3vCM/06pvt0XOip4nx3Jec6K5lwSvTWvkpLgfy4AAzs
-        VNGpll1cHK4leHQbEw1PMV6fhb8ui1OGLEZ0mXgPP4lHysClzWDYuJsxm0RXTXZiInlI1l2W9tdC0ETQ
+        V0UnmrdzaaiG4OEtjNe/yFhdFv7aLE4ZshjWZeI9uBGPlIFLm8GQcQejNonO6uzERPKQrKss7Z+5oImg
-        +CxjNY+LZf2fm/cqcBteZrKjVhxJAG7N2Yl92sSNqTf5aaKOaEDH9dHD/DCiZcFbwlVPId+59nHFns/l
+        8RVGq58Xy/o/N+1S4Da8yZn2GnEkAbg9Yyf2RSM3J97j1/FaogEdN0YO8vOwljlvCdc8hfzo2s1Vez5X
-        tly+sSQe1IhpbR9JwBftiVApkZP7ONlrw+PxCM86XueSJYfj75oxGo3o9XqWoqXC13wmMZEA3DxvZXHW
+        WnP53pJ4UMOmlX0kAV+3JUKlRE7u5mSPDY/HIzzteIfLlhyOfmTGaDSi1+tZiJYKX/eZxEQCcOuClflp
-        QSzcTsDXRSwWIxKJ4Pf7cTgchMNhVlZWqKqs4OpQowg/ALj/j3M15DIzM0M8Hmd1dVV4eXmZQCCATrND
+        B7FwGwFfJ7FYjEgkgt/vx+FwEA6HWVpaorKinGuDDSL8BODxP85Vn8vU1BTxeJzl5WXhxcVFAoEAOs02
-        jH3/TsRNrJfVan3DbDZH740tSdJvRUVFQxqN5qFkS1Iy2b+oGDVYvNay8wAAAABJRU5ErkJggg==
+        MfbjOxE3sVpWq/Vds9kcfTS2JEl/FhUVDWo0mjXJlqRksn8BnQo1VNrG3KYAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FEQ0000/Equipment/ReportB.rdlc

@@ -567,6 +567,7 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
+                  <rd:Selected>true</rd:Selected>
                 </CellContents>
               </TablixHeader>
               <TablixMembers>
@@ -629,7 +630,6 @@
                       <SortExpressions>
                         <SortExpression>
                           <Value>=Fields!lineP.Value</Value>
-                          <Direction>Descending</Direction>
                         </SortExpression>
                       </SortExpressions>
                       <TablixHeader>

SubProject/FEQ0000/Equipment/fEquipment.Designer.cs

@@ -54,6 +54,24 @@
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
             this.dv = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ing = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grp2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.type = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.label1 = new System.Windows.Forms.Label();
@@ -71,6 +89,14 @@
             this.radexpa = new System.Windows.Forms.RadioButton();
             this.radexpn = new System.Windows.Forms.RadioButton();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
+            this.cmbCate = new System.Windows.Forms.ComboBox();
+            this.cmbGrp2 = new System.Windows.Forms.Label();
+            this.cmbPlant = new System.Windows.Forms.ComboBox();
+            this.label6 = new System.Windows.Forms.Label();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -95,23 +121,8 @@
             this.taIng = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
             this.bsOther = new System.Windows.Forms.BindingSource(this.components);
             this.taOther = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter();
-            this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bsAll = new System.Windows.Forms.BindingSource(this.components);
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.type = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
@@ -120,11 +131,13 @@
             this.cm1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsF)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsME)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsIng)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsOther)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsAll)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -300,8 +313,8 @@
             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(150, 22);
+            this.toolStripButton1.Size = new System.Drawing.Size(181, 22);
-            this.toolStripButton1.Text = "Tem/Part/Plant Update";
+            this.toolStripButton1.Text = "Tem/Part/Plant/Grp2 Update";
             this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다.";
             this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
             // 
@@ -318,8 +331,10 @@
             this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
+            this.ing,
+            this.except,
             this.plant,
-            this.dataGridViewTextBoxColumn2,
+            this.grp2,
             this.dataGridViewTextBoxColumn3,
             this.flag,
             this.dataGridViewTextBoxColumn4,
@@ -332,7 +347,6 @@
             this.dvc_param,
             this.dataGridViewTextBoxColumn7,
             this.primary,
-            this.except,
             this.memo});
             this.dv.ContextMenuStrip = this.cm1;
             this.dv.DataSource = this.bsB;
@@ -343,6 +357,131 @@
             this.dv.Size = new System.Drawing.Size(1105, 431);
             this.dv.TabIndex = 1;
             // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dataGridViewTextBoxColumn1.HeaderText = "idx";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Width = 47;
+            // 
+            // ing
+            // 
+            this.ing.DataPropertyName = "ing";
+            this.ing.HeaderText = "잉여";
+            this.ing.Name = "ing";
+            // 
+            // except
+            // 
+            this.except.DataPropertyName = "except";
+            this.except.HeaderText = "제외";
+            this.except.Name = "except";
+            this.except.Width = 49;
+            // 
+            // plant
+            // 
+            this.plant.DataPropertyName = "plant";
+            this.plant.HeaderText = "plant";
+            this.plant.Name = "plant";
+            // 
+            // grp2
+            // 
+            this.grp2.DataPropertyName = "grp2";
+            this.grp2.HeaderText = "Cate";
+            this.grp2.Name = "grp2";
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "asset";
+            this.dataGridViewTextBoxColumn3.HeaderText = "asset";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 61;
+            // 
+            // flag
+            // 
+            this.flag.DataPropertyName = "flag";
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.flag.DefaultCellStyle = dataGridViewCellStyle2;
+            this.flag.HeaderText = "flag";
+            this.flag.Name = "flag";
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "grp";
+            this.dataGridViewTextBoxColumn4.HeaderText = "grp";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 48;
+            // 
+            // type
+            // 
+            this.type.DataPropertyName = "type";
+            this.type.HeaderText = "type";
+            this.type.Name = "type";
+            this.type.Width = 54;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "manu";
+            this.dataGridViewTextBoxColumn8.HeaderText = "manu";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.Width = 62;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "model";
+            this.dataGridViewTextBoxColumn5.HeaderText = "model";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 65;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode";
+            this.dataGridViewTextBoxColumn6.HeaderText = "linecode";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Width = 78;
+            // 
+            // lineT
+            // 
+            this.lineT.DataPropertyName = "lineT";
+            this.lineT.HeaderText = "Team";
+            this.lineT.Name = "lineT";
+            // 
+            // lineP
+            // 
+            this.lineP.DataPropertyName = "lineP";
+            this.lineP.HeaderText = "Part";
+            this.lineP.Name = "lineP";
+            // 
+            // dvc_param
+            // 
+            this.dvc_param.DataPropertyName = "param1";
+            this.dvc_param.HeaderText = "Wafer Size";
+            this.dvc_param.Name = "dvc_param";
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "serial";
+            this.dataGridViewTextBoxColumn7.HeaderText = "serial";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Width = 61;
+            // 
+            // primary
+            // 
+            this.primary.DataPropertyName = "primary";
+            this.primary.HeaderText = "primary";
+            this.primary.Name = "primary";
+            this.primary.Width = 54;
+            // 
+            // memo
+            // 
+            this.memo.DataPropertyName = "memo";
+            this.memo.HeaderText = "memo";
+            this.memo.Name = "memo";
+            this.memo.Width = 66;
+            // 
             // cm1
             // 
             this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -360,7 +499,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(40, 36);
+            this.label1.Location = new System.Drawing.Point(40, 38);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(25, 12);
             this.label1.TabIndex = 0;
@@ -371,7 +510,7 @@
             this.cmbGrp.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.cmbGrp.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.cmbGrp.FormattingEnabled = true;
-            this.cmbGrp.Location = new System.Drawing.Point(72, 32);
+            this.cmbGrp.Location = new System.Drawing.Point(72, 35);
             this.cmbGrp.Name = "cmbGrp";
             this.cmbGrp.Size = new System.Drawing.Size(142, 20);
             this.cmbGrp.TabIndex = 1;
@@ -379,7 +518,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(8, 62);
+            this.label2.Location = new System.Drawing.Point(8, 61);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(57, 12);
             this.label2.TabIndex = 2;
@@ -398,7 +537,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(28, 91);
+            this.label3.Location = new System.Drawing.Point(28, 84);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(37, 12);
             this.label3.TabIndex = 4;
@@ -409,7 +548,7 @@
             this.cmbManu.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.cmbManu.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.cmbManu.FormattingEnabled = true;
-            this.cmbManu.Location = new System.Drawing.Point(72, 84);
+            this.cmbManu.Location = new System.Drawing.Point(72, 81);
             this.cmbManu.Name = "cmbManu";
             this.cmbManu.Size = new System.Drawing.Size(142, 20);
             this.cmbManu.TabIndex = 5;
@@ -417,7 +556,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(31, 114);
+            this.label4.Location = new System.Drawing.Point(31, 107);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(34, 12);
             this.label4.TabIndex = 6;
@@ -428,7 +567,7 @@
             this.cmbType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
             this.cmbType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.cmbType.FormattingEnabled = true;
-            this.cmbType.Location = new System.Drawing.Point(72, 110);
+            this.cmbType.Location = new System.Drawing.Point(72, 104);
             this.cmbType.Name = "cmbType";
             this.cmbType.Size = new System.Drawing.Size(142, 20);
             this.cmbType.TabIndex = 7;
@@ -436,7 +575,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(21, 10);
+            this.label5.Location = new System.Drawing.Point(21, 15);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(44, 12);
             this.label5.TabIndex = 8;
@@ -444,7 +583,7 @@
             // 
             // tbSearch
             // 
-            this.tbSearch.Location = new System.Drawing.Point(72, 5);
+            this.tbSearch.Location = new System.Drawing.Point(72, 11);
             this.tbSearch.Name = "tbSearch";
             this.tbSearch.Size = new System.Drawing.Size(142, 21);
             this.tbSearch.TabIndex = 9;
@@ -454,7 +593,7 @@
             this.groupBox1.Controls.Add(this.radexpy);
             this.groupBox1.Controls.Add(this.radexpa);
             this.groupBox1.Controls.Add(this.radexpn);
-            this.groupBox1.Location = new System.Drawing.Point(220, 5);
+            this.groupBox1.Location = new System.Drawing.Point(237, 73);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Size = new System.Drawing.Size(186, 48);
             this.groupBox1.TabIndex = 13;
@@ -464,7 +603,7 @@
             // radexpy
             // 
             this.radexpy.AutoSize = true;
-            this.radexpy.Location = new System.Drawing.Point(63, 19);
+            this.radexpy.Location = new System.Drawing.Point(66, 22);
             this.radexpy.Name = "radexpy";
             this.radexpy.Size = new System.Drawing.Size(45, 16);
             this.radexpy.TabIndex = 12;
@@ -475,7 +614,7 @@
             // radexpa
             // 
             this.radexpa.AutoSize = true;
-            this.radexpa.Location = new System.Drawing.Point(14, 21);
+            this.radexpa.Location = new System.Drawing.Point(14, 22);
             this.radexpa.Name = "radexpa";
             this.radexpa.Size = new System.Drawing.Size(36, 16);
             this.radexpa.TabIndex = 12;
@@ -487,7 +626,7 @@
             // 
             this.radexpn.AutoSize = true;
             this.radexpn.Checked = true;
-            this.radexpn.Location = new System.Drawing.Point(118, 21);
+            this.radexpn.Location = new System.Drawing.Point(130, 22);
             this.radexpn.Name = "radexpn";
             this.radexpn.Size = new System.Drawing.Size(39, 16);
             this.radexpn.TabIndex = 12;
@@ -497,6 +636,11 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.groupBox2);
+            this.panel1.Controls.Add(this.cmbCate);
+            this.panel1.Controls.Add(this.cmbGrp2);
+            this.panel1.Controls.Add(this.cmbPlant);
+            this.panel1.Controls.Add(this.label6);
             this.panel1.Controls.Add(this.groupBox1);
             this.panel1.Controls.Add(this.tbSearch);
             this.panel1.Controls.Add(this.label5);
@@ -515,6 +659,88 @@
             this.panel1.TabIndex = 2;
             this.panel1.Visible = false;
             // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.radioButton1);
+            this.groupBox2.Controls.Add(this.radioButton2);
+            this.groupBox2.Controls.Add(this.radioButton3);
+            this.groupBox2.Location = new System.Drawing.Point(431, 73);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(186, 48);
+            this.groupBox2.TabIndex = 14;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "잉여";
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(66, 23);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(45, 16);
+            this.radioButton1.TabIndex = 12;
+            this.radioButton1.Text = "Yes";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Location = new System.Drawing.Point(14, 23);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(36, 16);
+            this.radioButton2.TabIndex = 12;
+            this.radioButton2.Text = "all";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Checked = true;
+            this.radioButton3.Location = new System.Drawing.Point(126, 23);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(39, 16);
+            this.radioButton3.TabIndex = 12;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "No";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
+            // cmbCate
+            // 
+            this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.cmbCate.FormattingEnabled = true;
+            this.cmbCate.Location = new System.Drawing.Point(301, 39);
+            this.cmbCate.Name = "cmbCate";
+            this.cmbCate.Size = new System.Drawing.Size(142, 20);
+            this.cmbCate.TabIndex = 17;
+            // 
+            // cmbGrp2
+            // 
+            this.cmbGrp2.AutoSize = true;
+            this.cmbGrp2.Location = new System.Drawing.Point(237, 43);
+            this.cmbGrp2.Name = "cmbGrp2";
+            this.cmbGrp2.Size = new System.Drawing.Size(56, 12);
+            this.cmbGrp2.TabIndex = 16;
+            this.cmbGrp2.Text = "Category";
+            // 
+            // cmbPlant
+            // 
+            this.cmbPlant.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.cmbPlant.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+            this.cmbPlant.FormattingEnabled = true;
+            this.cmbPlant.Location = new System.Drawing.Point(301, 16);
+            this.cmbPlant.Name = "cmbPlant";
+            this.cmbPlant.Size = new System.Drawing.Size(142, 20);
+            this.cmbPlant.TabIndex = 15;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(237, 20);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(33, 12);
+            this.label6.TabIndex = 14;
+            this.label6.Text = "Plant";
+            // 
             // toolStrip1
             // 
             this.toolStrip1.AutoSize = false;
@@ -661,6 +887,7 @@
             this.tam.BackupDataSetBeforeUpdate = false;
             this.tam.EETGW_EquipmentIngTableAdapter = null;
             this.tam.EETGW_EquipmentOtherTableAdapter = null;
+            this.tam.EETGW_EquipmentTableAdapter = null;
             this.tam.EquipmentBTableAdapter = this.taB;
             this.tam.EquipmentFilterTableAdapter = null;
             this.tam.EquipmentFTableAdapter = this.taF;
@@ -695,126 +922,14 @@
             // 
             this.taOther.ClearBeforeFill = true;
             // 
-            // dataGridViewTextBoxColumn1
+            // taAll
             // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
+            this.taAll.ClearBeforeFill = true;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
-            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
-            this.dataGridViewTextBoxColumn1.HeaderText = "idx";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Width = 47;
             // 
-            // plant
+            // bsAll
             // 
-            this.plant.DataPropertyName = "plant";
+            this.bsAll.DataMember = "EETGW_Equipment";
-            this.plant.HeaderText = "plant";
+            this.bsAll.DataSource = this.dsEQ;
-            this.plant.Name = "plant";
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
-            this.dataGridViewTextBoxColumn2.HeaderText = "pdate";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Visible = false;
-            this.dataGridViewTextBoxColumn2.Width = 61;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "asset";
-            this.dataGridViewTextBoxColumn3.HeaderText = "asset";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.Width = 61;
-            // 
-            // flag
-            // 
-            this.flag.DataPropertyName = "flag";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.flag.DefaultCellStyle = dataGridViewCellStyle2;
-            this.flag.HeaderText = "flag";
-            this.flag.Name = "flag";
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "grp";
-            this.dataGridViewTextBoxColumn4.HeaderText = "grp";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.Width = 48;
-            // 
-            // type
-            // 
-            this.type.DataPropertyName = "type";
-            this.type.HeaderText = "type";
-            this.type.Name = "type";
-            this.type.Width = 54;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.DataPropertyName = "manu";
-            this.dataGridViewTextBoxColumn8.HeaderText = "manu";
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.Width = 62;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "model";
-            this.dataGridViewTextBoxColumn5.HeaderText = "model";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.Width = 65;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode";
-            this.dataGridViewTextBoxColumn6.HeaderText = "linecode";
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.Width = 78;
-            // 
-            // lineT
-            // 
-            this.lineT.DataPropertyName = "lineT";
-            this.lineT.HeaderText = "Team";
-            this.lineT.Name = "lineT";
-            // 
-            // lineP
-            // 
-            this.lineP.DataPropertyName = "lineP";
-            this.lineP.HeaderText = "Part";
-            this.lineP.Name = "lineP";
-            // 
-            // dvc_param
-            // 
-            this.dvc_param.DataPropertyName = "param1";
-            this.dvc_param.HeaderText = "Wafer Size";
-            this.dvc_param.Name = "dvc_param";
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.DataPropertyName = "serial";
-            this.dataGridViewTextBoxColumn7.HeaderText = "serial";
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.Width = 61;
-            // 
-            // primary
-            // 
-            this.primary.DataPropertyName = "primary";
-            this.primary.HeaderText = "primary";
-            this.primary.Name = "primary";
-            this.primary.Width = 54;
-            // 
-            // except
-            // 
-            this.except.DataPropertyName = "except";
-            this.except.HeaderText = "except";
-            this.except.Name = "except";
-            this.except.Width = 49;
-            // 
-            // memo
-            // 
-            this.memo.DataPropertyName = "memo";
-            this.memo.HeaderText = "memo";
-            this.memo.Name = "memo";
-            this.memo.Width = 66;
             // 
             // fEquipment
             // 
@@ -839,12 +954,15 @@
             this.groupBox1.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bsF)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsME)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsIng)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsOther)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsAll)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -915,9 +1033,15 @@
         private System.Windows.Forms.ToolStripProgressBar prb1;
         private System.Windows.Forms.BindingSource bsOther;
         private dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter taOther;
+        private System.Windows.Forms.ComboBox cmbCate;
+        private System.Windows.Forms.Label cmbGrp2;
+        private System.Windows.Forms.ComboBox cmbPlant;
+        private System.Windows.Forms.Label label6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ing;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn except;
         private System.Windows.Forms.DataGridViewTextBoxColumn plant;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn grp2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn flag;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
@@ -930,7 +1054,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dvc_param;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewCheckBoxColumn primary;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn except;
         private System.Windows.Forms.DataGridViewTextBoxColumn memo;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private dsEQTableAdapters.EETGW_EquipmentTableAdapter taAll;
+        private System.Windows.Forms.BindingSource bsAll;
     }
 }

SubProject/FEQ0000/Equipment/fEquipment.cs

@@ -16,6 +16,7 @@ namespace FEQ0000
     {
         public enum eTabletype
         {
+            ALL,
             MOLD,
             FOL,
             BUMP,
@@ -57,6 +58,14 @@ namespace FEQ0000
                 this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
                 dvc_param.Visible = false;
             }
+            else if (dataType == eTabletype.ALL)
+            {
+
+                tableName = "EETGW_Equipment";
+                this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
+                dvc_param.Visible = false;
+                panel1.Visible = true; //필터창보이게
+            }
             else
             {
 
@@ -65,6 +74,7 @@ namespace FEQ0000
                 dvc_param.Visible = true;
             }
             this.FormClosed += fEquipment_FormClosed;
+            
         }
 
         void fEquipment_FormClosed(object sender, FormClosedEventArgs e)
@@ -83,6 +93,7 @@ namespace FEQ0000
             else if (dataType == eTabletype.FOL) dtList = taDateList.GetDateListF();
             else if (dataType == eTabletype.ING) dtList = taDateList.GetDateListIng();
             else if (dataType == eTabletype.OTHER) dtList = taDateList.GetDateListOther();
+            else if (dataType == eTabletype.ALL) dtList = taDateList.GetDateListAll();
             else dtList = taDateList.GetDateListME();
 
             this.cmbDate.Items.Clear();
@@ -111,21 +122,29 @@ namespace FEQ0000
             var lcList = DatabaseManager.getEQGroupLiist("linecode", this.tableName);
             var manuList = DatabaseManager.getEQGroupLiist("manu", this.tableName);
             var typeList = DatabaseManager.getEQGroupLiist("type", this.tableName);
+            var plantList = DatabaseManager.getEQGroupLiist("plant", this.tableName);
+            var grp2List = DatabaseManager.getEQGroupLiist("grp2", this.tableName);
 
             cmbGrp.Items.Add("-- All --");
             cmbLine.Items.Add("-- All --");
             cmbManu.Items.Add("-- All --");
             cmbType.Items.Add("-- All --");
+            cmbPlant.Items.Add("-- All --");
+            cmbCate.Items.Add("-- All --");
 
             foreach (var item in grpList) this.cmbGrp.Items.Add(item);
             foreach (var item in lcList) this.cmbLine.Items.Add(item);
             foreach (var item in manuList) this.cmbManu.Items.Add(item);
             foreach (var item in typeList) this.cmbType.Items.Add(item);
+            foreach (var item in plantList) this.cmbPlant.Items.Add(item);
+            foreach (var item in grp2List) this.cmbCate.Items.Add(item);
 
             if (this.cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
             if (this.cmbLine.Items.Count > 0) cmbLine.SelectedIndex = 0;
             if (this.cmbManu.Items.Count > 0) cmbManu.SelectedIndex = 0;
             if (this.cmbType.Items.Count > 0) cmbType.SelectedIndex = 0;
+            if (this.cmbPlant.Items.Count > 0) cmbPlant.SelectedIndex = 0;
+            if (this.cmbCate.Items.Count > 0) cmbCate.SelectedIndex = 0;
 
             //if (this.dataType == eTabletype.ING)
             //    dvc_param.HeaderText = "RCS Flag";
@@ -157,10 +176,15 @@ namespace FEQ0000
                 {
                     this.taIng.Update(this.dsEQ.EETGW_EquipmentIng);
                 }
-                else if(dataType == eTabletype.OTHER)
+                else if (dataType == eTabletype.OTHER)
                 {
                     this.taOther.Update(this.dsEQ.EETGW_EquipmentOther);
                 }
+                else if (dataType == eTabletype.ALL)
+                {
+                   
+                    taAll.Update(this.dsEQ.EETGW_Equipment);
+                }
                 else
                 {
                     this.taF.Update(this.dsEQ.EquipmentF);
@@ -192,6 +216,7 @@ namespace FEQ0000
                 else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter);
                 else if (dataType == eTabletype.ING) dRows = this.dsEQ.EETGW_EquipmentIng.Select(filter);
                 else if (dataType == eTabletype.OTHER) dRows = this.dsEQ.EETGW_EquipmentOther.Select(filter);
+                else if (dataType == eTabletype.ALL) dRows = this.dsEQ.EETGW_Equipment.Select(filter);
                 else dRows = this.dsEQ.EquipmentF.Select(filter);
 
                 int cnt = 0;
@@ -235,6 +260,7 @@ namespace FEQ0000
                     else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter;
                     else if (dataType == eTabletype.ING) this.bsIng.Filter = filter;
                     else if (dataType == eTabletype.OTHER) this.bsOther.Filter = filter;
+                    else if (dataType == eTabletype.ALL) this.bsAll.Filter = filter;
                     else this.bsF.Filter = filter;
 
                     if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
@@ -258,8 +284,22 @@ namespace FEQ0000
 
         private void toolStripButton4_Click(object sender, EventArgs e)
         {
-            var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
+            if(this.dataType == eTabletype.ALL)
-            f.Show();
+            {
+                if(this.dsEQ.EETGW_Equipment.Count < 1)
+                {
+                    FCOMMON.Util.MsgE("자료가 없습니다. 자료를 조회하고 시도하세요");
+                    return;
+                }
+                var f = new rpt_equipmentAll(this.dsEQ.EETGW_Equipment,this.grp2name);
+                f.Show();
+            }
+            else
+            {
+                var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
+                f.Show();
+            }
+            
         }
 
         private void toolStripButton2_Click(object sender, EventArgs e)
@@ -274,6 +314,7 @@ namespace FEQ0000
             RefreshDate();
         }
 
+        string grp2name = string.Empty;
         private void toolStripButton6_Click(object sender, EventArgs e)
         {
             if (cmbDate.SelectedIndex < 0)
@@ -283,10 +324,12 @@ namespace FEQ0000
             }
 
 
+            this.grp2name = this.cmbCate.Text;
+
 
             //select query
             string newSQL = "select * from {0}";
-            string newWhere = string.Empty;
+            string newWhere = "pdate = '{1}'";
             if (cmbGrp.SelectedIndex != 0 && !cmbGrp.Text.isEmpty())
             {
                 if (!newWhere.isEmpty()) newWhere += " and ";
@@ -312,6 +355,16 @@ namespace FEQ0000
                 if (!newWhere.isEmpty()) newWhere += " and ";
                 newWhere += string.Format("(asset like '%{0}%' or model like '%{0}%' or serial like '%{0}%')", tbSearch.Text);
             }
+            if (this.cmbPlant.SelectedIndex > 0 &&  !this.cmbPlant.Text.isEmpty())
+            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "[plant]='" + cmbPlant.Text + "'";
+            }
+            if (this.cmbCate.SelectedIndex > 0 && !this.cmbCate.Text.isEmpty())
+            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "[grp2]='" + cmbCate.Text + "'";
+            }
             if (radexpn.Checked)
             {
                 if (!newWhere.isEmpty()) newWhere += " and ";
@@ -322,18 +375,30 @@ namespace FEQ0000
                 if (!newWhere.isEmpty()) newWhere += " and ";
                 newWhere += string.Format("isnull([except],0) = 1");
             }
-
+            if (radioButton1.Checked) //yes
+            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += string.Format("isnull([ing],0) = 1");
+            }
+            if (radioButton3.Checked) //no
+            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += string.Format("isnull([ing],0) = 0");
+            }
 
             string CommandText = newSQL;
             if (!newWhere.isEmpty()) CommandText += " where " + newWhere;
 
+            
+        
+
             switch (dataType)
             {
                 case eTabletype.MOLD:
                     //select command
                     if (this.taME.Adapter.SelectCommand == null)
                         this.taME.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    this.taME.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentME");
+                    this.taME.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentME", this.cmbDate.Text);
                     this.dsEQ.EquipmentME.Clear();
                     taME.Fill(this.dsEQ.EquipmentME, this.cmbDate.Text);
                     this.dsEQ.EquipmentME.AcceptChanges();
@@ -344,7 +409,7 @@ namespace FEQ0000
                     //select command
                     if (this.taB.Adapter.SelectCommand == null)
                         this.taB.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    this.taB.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentB");
+                    this.taB.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentB", this.cmbDate.Text);
                     this.dsEQ.EquipmentB.Clear();
                     taB.Fill(this.dsEQ.EquipmentB, this.cmbDate.Text);
                     this.dsEQ.EquipmentB.AcceptChanges();
@@ -355,7 +420,7 @@ namespace FEQ0000
                     //select command
                     if (this.taF.Adapter.SelectCommand == null)
                         this.taF.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    this.taF.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentF");
+                    this.taF.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentF",this.cmbDate.Text);
                     this.dsEQ.EquipmentF.Clear();
                     taF.Fill(this.dsEQ.EquipmentF, this.cmbDate.Text);
                     this.dsEQ.EquipmentF.AcceptChanges();
@@ -366,18 +431,37 @@ namespace FEQ0000
                     //select command
                     if (this.taIng.Adapter.SelectCommand == null)
                         this.taIng.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    this.taIng.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_EquipmentIng");
+                    this.taIng.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_EquipmentIng", this.cmbDate.Text);
                     this.dsEQ.EETGW_EquipmentIng.Clear();
                     taIng.Fill(this.dsEQ.EETGW_EquipmentIng, this.cmbDate.Text);
                     this.dsEQ.EETGW_EquipmentIng.AcceptChanges();
                     dv.DataSource = bsIng;
                     bn.BindingSource = bsIng;
                     break;
+                case eTabletype.ALL:
+                    CommandText = string.Format(CommandText, "EETGW_Equipment", this.cmbDate.Text);
+                    var cmd = new System.Data.SqlClient.SqlCommand(CommandText, this.taAll.Connection);
+                    var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
+                    dsEQ.EETGW_Equipment.Clear();
+                    da.Fill(this.dsEQ.EETGW_Equipment);
+                    dsEQ.EETGW_Equipment.AcceptChanges();
+
+
+                    ////select command
+                    //if (this.taAll.Adapter.SelectCommand == null)
+                    //    this.taAll.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
+                    //this.taAll.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_Equipment");
+                    //this.dsEQ.EETGW_Equipment.Clear();
+                    //taAll.Fill(this.dsEQ.EETGW_Equipment, this.cmbDate.Text);
+                    //this.dsEQ.EETGW_Equipment.AcceptChanges();
+                    dv.DataSource = bsAll;
+                    bn.BindingSource = bsAll;
+                    break;
                 case eTabletype.OTHER:
                     //select command
                     if (this.taOther.Adapter.SelectCommand == null)
                         this.taOther.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    this.taOther.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_EquipmentOther");
+                    this.taOther.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_Equipment");
                     this.dsEQ.EETGW_EquipmentOther.Clear();
                     taOther.Fill(this.dsEQ.EETGW_EquipmentOther, this.cmbDate.Text);
                     this.dsEQ.EETGW_EquipmentOther.AcceptChanges();
@@ -507,11 +591,12 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
                         {
                             dr.lineP = linedata.part;
                             dr.lineT = linedata.team;
                             dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
                             dr.EndEdit();
                             ucnt += 1;
                         }
@@ -528,11 +613,12 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
                         {
                             dr.lineP = linedata.part;
                             dr.lineT = linedata.team;
                             dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
                             dr.EndEdit();
                             ucnt += 1;
                         }
@@ -549,11 +635,12 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
                         {
                             dr.lineP = linedata.part;
                             dr.lineT = linedata.team;
                             dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
                             dr.EndEdit();
                             ucnt += 1;
                         }
@@ -570,11 +657,34 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
                         {
                             dr.lineP = linedata.part;
                             dr.lineT = linedata.team;
                             dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
+                            dr.EndEdit();
+                            ucnt += 1;
+                        }
+                    }
+                }
+            }
+            else if (dataType == eTabletype.ALL)
+            {
+                this.prb1.Maximum = this.dsEQ.EETGW_Equipment.Count;
+                foreach (dsEQ.EETGW_EquipmentRow dr in this.dsEQ.EETGW_Equipment)
+                {
+                    if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
+                    if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
+                    var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
+                    if (linedata != null)
+                    {
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        {
+                            dr.lineP = linedata.part;
+                            dr.lineT = linedata.team;
+                            dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
                             dr.EndEdit();
                             ucnt += 1;
                         }
@@ -591,11 +701,12 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
                         {
                             dr.lineP = linedata.part;
                             dr.lineT = linedata.team;
                             dr.plant = linedata.plant;
+                            dr.grp2 = linedata.grp2;
                             dr.EndEdit();
                             ucnt += 1;
                         }

SubProject/FEQ0000/Equipment/fEquipment.resx

@@ -228,9 +228,18 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="ing.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="plant.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="grp2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="flag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -249,9 +258,6 @@
   <metadata name="primary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="memo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -273,12 +279,12 @@
   <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIHVR8VEVcWfF
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZJLS8NAFIVHf2dbzGRt9zXFQCqYuqmKuLOi
-        VpoWStRJQd2pq9Y02You484GXVqlMOZeZ0pjHkYPHLjMud8ZBoakiXOyMOgV9IFVXINZHOcTAF5fNV8e
+        laaCRJ0UqjvtqjVNVuoPiKAVRJc+KIy515nSmIexBw5c5tzvDAND0sQ5WRicFPSBXVyFWRznEwB+V7Ue
-        Nqdgr6+YuUt0XV902VI3eNye8tcWB8MMZ5CJtWQhbEfh+RLHVjqpJRB4F7QTPO3EYGkogZ3Yc/DNTDWz
+        b9cnYL+rWLlLdF1f9NjS8fiuPuGvLQ6GGc4gE2vJQtiJwrMlrqN0Uksg8M9pZ3y/EYOloQR2Ys/BNzPV
-        YGnYGTHanpXAMLJpOw8sjSUhgyVDq6iN/a1PGd5db/D1ahnnVkPjp8cVnKtGGTO5N/YPPu7PSqvEOY8W
+        yoKlYWfEaHtaAsPIoe08sDSWhAyWDO2i9hSYXzLsX9b5Wq2Mc6up8aP9Ks41o4yZ3HsOdj5vTksrxD2L
-        3FzWuCEKTo403mx8FxjGMr+9qkULrNIKPsNltP72XH+X4W+GXWAQlnKZuhv4h5MkYN6JsJRr072sEsjg
+        Flz1TG6IgoM9jR82fwoMY5lfX5jRArtUwWd4jDbeHhrvMvzLsAsMwlIeUzdfgt2PJGDWibCU59CtrBLI
-        IrGerLQShMNMrGXrZ8mfYCmPKfsA/gsGwScZWoWKE/6T2a+LiZAvNU/p9XnZUIQAAAAASUVORK5CYII=
+        4CKxnqy0EoTDTKxl63fJv2ApnynbAM4Fg+CTDO1C1Q3/yfTXxUTIN1uh6VOm+F1TAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -288,11 +294,11 @@
         s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
         Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
         /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
-        d/+7t3/4X7/u7p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+        d/+7t3/4X7/u5p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
         IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
         qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
         O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
-        AA/RLxW0ki8TAAAAAElFTkSuQmCC
+        AP72Lw00N2hvAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -310,14 +316,14 @@
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
-        BqQwU7PU1rbVtlw1S9vcdbWtzcTwpahEI4OI8NabWZeIImvajZFaW9Ie+F3m93+GGYZRVUJDbvSZPFuY
+        BqQwMzVf2m1ba8s1s7TNXTe1VhPFl6ISDT0VdOmFMusSUWRNuzFSq0vWA7/L/P7PMMMwqlpoqO0Bs2sX
-        idp0mty8QYv5u1H1NxrM1WHxhUP86e1zpgChlPT9B2SOLwriRgQAoA6N/kYsa61eIZy6K36J5Ymc599n
+        M9MBh9kZ1Gsxby+qfkeDrXVZPWF/MHf7nC1CKCVz/wHZk7OiuBEJAGhAo9WIZT3uFsLpu9KXWJlI/uZ9
-        3JsYGv/NtJMdTORu35TkUrjjXF5NrPQgRQ7BxGgl6WfS+XdodIX0SJGzxB9ElKTyYOthEily7GyCUxJ+
+        zhnA0Hg1Bgc3nLy4elOSy+FPLgpqcr0PKXJINs4oST+TKbxD45p/FilyVoKHESWpMthWmEKKnCUuySsJ
-        Ji3G5Nm2IEWOwRFSH169KIqlCNnLJ43V24cUOUOzVCvhEx6URCnS68x5BBqNywGAbNSRdJDYThat/r3H
+        P5MRY3btWZEiR2/3q4+uXxTFcoT8+ZMGdw8gRc6IiW4nPcKDkihFep15l8CgcTkAUM06itnB91Il3Bt7
-        o+tXmRw/uynOre7sjE7ibUj5BlgszYZlJuriEx9TNq93AMebzCv8mI2LB+1sLDnPRGmDM9SvgrAGKd8A
+        PL55lcmJ3GVpfiMUGp8mOpDyDbBaW/WrbHSVj33M2NzuIYJosawHJ2x8YmeJi6cW2Cijd/gHVRDWIeUb
-        I9ludLC7TCwDdYu+gCjXo6oyw5ijc5Zi99n4CdSTtADAWgOqKjM+TXWZqUCKS55C8fiREa2tBVXVoSV8
+        YKQ6jXZun41noW7Z4xPlRlTVZhSzd5to7oBLnMJZihEA2GxCVW0mDXSPhfal+VQOisePjGltbaj6G1rS
-        C9x+FkonkD4QWq4etdXRO4F7cOkaaOkfqFSfYfuXgmGBwFoAAAAASUVORK5CYII=
+        s8gf5KF0AukDoeW/o8bt/VOEi5CugZb+gUr1CRb3l19ObxlcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -375,4 +381,10 @@
   <metadata name="taOther.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>407, 56</value>
   </metadata>
+  <metadata name="taAll.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>501, 56</value>
+  </metadata>
+  <metadata name="bsAll.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>577, 56</value>
+  </metadata>
 </root>

SubProject/FEQ0000/Equipment/fImpEquipment.Designer.cs

@@ -36,6 +36,8 @@
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.button3 = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
             this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
@@ -51,14 +53,12 @@
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.label1 = new System.Windows.Forms.Label();
-            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             this.SuspendLayout();
             // 
             // textBox1
@@ -96,7 +96,7 @@
             this.dataGridView1.Location = new System.Drawing.Point(0, 36);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(693, 467);
+            this.dataGridView1.Size = new System.Drawing.Size(807, 426);
             this.dataGridView1.TabIndex = 1;
             // 
             // button3
@@ -121,9 +121,31 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(693, 36);
+            this.panel1.Size = new System.Drawing.Size(807, 36);
             this.panel1.TabIndex = 0;
             // 
+            // numericUpDown1
+            // 
+            this.numericUpDown1.Location = new System.Drawing.Point(261, 9);
+            this.numericUpDown1.Maximum = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+            this.numericUpDown1.Name = "numericUpDown1";
+            this.numericUpDown1.Size = new System.Drawing.Size(45, 21);
+            this.numericUpDown1.TabIndex = 3;
+            this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(218, 13);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(37, 12);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Sheet";
+            // 
             // dateTimePicker1
             // 
             this.dateTimePicker1.Location = new System.Drawing.Point(390, 9);
@@ -150,14 +172,14 @@
             this.bindingNavigatorAddNewItem,
             this.bindingNavigatorDeleteItem,
             this.progressBar1});
-            this.bn.Location = new System.Drawing.Point(0, 503);
+            this.bn.Location = new System.Drawing.Point(0, 462);
             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(693, 25);
+            this.bn.Size = new System.Drawing.Size(807, 25);
             this.bn.TabIndex = 2;
             this.bn.Text = "bindingNavigator1";
             // 
@@ -213,6 +235,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -252,33 +275,11 @@
             this.progressBar1.Name = "progressBar1";
             this.progressBar1.Size = new System.Drawing.Size(200, 22);
             // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(218, 13);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(37, 12);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Sheet";
-            // 
-            // numericUpDown1
-            // 
-            this.numericUpDown1.Location = new System.Drawing.Point(261, 9);
-            this.numericUpDown1.Maximum = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.numericUpDown1.Name = "numericUpDown1";
-            this.numericUpDown1.Size = new System.Drawing.Size(45, 21);
-            this.numericUpDown1.TabIndex = 3;
-            this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
             // fImpEquipment
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(693, 528);
+            this.ClientSize = new System.Drawing.Size(807, 487);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.bn);
             this.Controls.Add(this.panel1);
@@ -288,11 +289,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

SubProject/FEQ0000/Equipment/fImpEquipment.cs

@@ -71,7 +71,7 @@ namespace FEQ0000
         {
             List<string> datas = new List<string>();
             var charlist = line.ToCharArray();
-           // int c = 0;
+            // int c = 0;
             System.Text.StringBuilder sb = new StringBuilder();
             Boolean findCom = false;
             foreach (var ch in charlist)
@@ -102,13 +102,13 @@ namespace FEQ0000
         }
         private void button1_Click(object sender, EventArgs e)
         {
-            if(textBox1.Text.isEmpty())
+            if (textBox1.Text.isEmpty())
             {
                 FCOMMON.Util.MsgE("파일을 선택하세요");
                 textBox1.Focus();
                 return;
             }
-            if(!System.IO.File.Exists(textBox1.Text))
+            if (!System.IO.File.Exists(textBox1.Text))
             {
                 FCOMMON.Util.MsgE("입력하신 파일이 존재하지 않습니다.");
                 textBox1.Focus();
@@ -126,7 +126,8 @@ namespace FEQ0000
             try
             {
                 book.load(textBox1.Text);
-            }catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 FCOMMON.Util.MsgE(ex.Message);
                 return;
@@ -146,11 +147,12 @@ namespace FEQ0000
             var MinCol = sheet.firstCol();
             List<string> cols = new List<string>();
             bool firstRow = true;
-            try{
+            try
+            {
                 for (int r = MinRow; r <= MaxRow; r++)
                 {
                     DataRow dr = null;
-                    if (firstRow ==false) dr = dtExcel.NewRow();
+                    if (firstRow == false) dr = dtExcel.NewRow();
 
                     Boolean nullColumn = false;
                     for (int c = MinCol; c <= MaxCol; c++)
@@ -179,7 +181,7 @@ namespace FEQ0000
                 }
                 dtExcel.AcceptChanges();
             }
-           catch(Exception ex)
+            catch (Exception ex)
             {
                 FCOMMON.Util.MsgE("불러오는 중 오류 발생\n" + ex.Message);
             }
@@ -190,7 +192,7 @@ namespace FEQ0000
             this.dataGridView1.DataSource = dtExcel;
             this.bn.BindingSource = this.bs;
 
-            if(this.bs.Count < 1)
+            if (this.bs.Count < 1)
             {
                 FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다.");
             }
@@ -236,14 +238,13 @@ namespace FEQ0000
 
         private void button3_Click(object sender, EventArgs e)
         {
-            if(dtExcel == null || dtExcel.Rows.Count < 1)
+            if (dtExcel == null || dtExcel.Rows.Count < 1)
             {
                 FCOMMON.Util.MsgE("등록 가능한 자료가 없습니다.");
                 return;
             }
 
 
-
             System.Text.StringBuilder sb = new StringBuilder();
             sb.AppendLine("다음 자료를 추가하시겠습니까?");
             sb.AppendLine();
@@ -257,9 +258,8 @@ namespace FEQ0000
 
 
 
-            
             //라인코드를 읽어서 값을 기록해준다.
-            var taLine = new  dsEQTableAdapters.LineCodeTableAdapter();
+            var taLine = new dsEQTableAdapters.LineCodeTableAdapter();
             var lineTd = taLine.GetData();
             lineTd.AcceptChanges();
 
@@ -300,17 +300,34 @@ namespace FEQ0000
             }
 
             //12,13
+            var i = 0;
             foreach (DataRow dr in dtExcel.Rows)
             {
                 this.progressBar1.Value += 1;
+                i += 1;
+                if (i % 1000 == 0) Application.DoEvents();
 
                 var linecode = dr[12].ToString();
                 var linedesc = dr[13].ToString();
                 var lineT = string.Empty;
                 var lineP = string.Empty;
+                var grp2 = string.Empty;
                 var rcsflag = dr[1].ToString();
                 //if (rcsflag != "M") continue;
 
+                if (linecode.StartsWith("AJ900T")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AJ9000E")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AJ9000S")) continue;    //해외장비 제거
+
+                if (linecode.StartsWith("AF900T")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AF9000E")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AF9000S")) continue;    //해외장비 제거
+
+                if (linecode.StartsWith("AS900T")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AS9000E")) continue;    //해외장비 제거
+                if (linecode.StartsWith("AS9000S")) continue;    //해외장비 제거
+
+
                 //없는 라인코드는 추가
                 var lineDrows = lineTd.Select("code='" + linecode + "'");
                 if (lineDrows.Length == 0)
@@ -343,6 +360,8 @@ namespace FEQ0000
                     var lineDr = lineDrows[0] as dsEQ.LineCodeRow;
                     lineT = lineDr.team;
                     lineP = lineDr.part;
+                    grp2 = lineDr.grp2;
+
                 }
 
                 //데이터추가
@@ -355,6 +374,7 @@ namespace FEQ0000
                 newdr["linecode"] = linecode;
                 newdr["lineT"] = lineT;
                 newdr["lineP"] = lineP;
+                newdr["grp2"] = grp2;
                 newdr["serial"] = dr[7].ToString();
                 newdr["manu"] = dr[9].ToString();
                 newdr["primary"] = true;

SubProject/FEQ0000/Equipment/rpt_equipmentAll.Designer.cs

@@ -0,0 +1,109 @@
+namespace FEQ0000
+{
+    partial class rpt_equipmentAll
+    {
+        /// <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()
+        {
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.rpv1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.dsEQ = new FEQ0000.dsEQ();
+            this.taB = new FEQ0000.dsEQTableAdapters.vEquStockBTableAdapter();
+            this.taF = new FEQ0000.dsEQTableAdapters.vEquStockFTableAdapter();
+            this.taE = new FEQ0000.dsEQTableAdapters.vEquStockMETableAdapter();
+            this.taI = new FEQ0000.dsEQTableAdapters.vEquStockIngTableAdapter();
+            this.taO = new FEQ0000.dsEQTableAdapters.vEquStockOtherTableAdapter();
+            this.taSum = new FEQ0000.dsEQTableAdapters.vEquStockSummaryTableAdapter();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // rpv1
+            // 
+            this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
+            reportDataSource1.Name = "DataSet1";
+            reportDataSource1.Value = null;
+            this.rpv1.LocalReport.DataSources.Add(reportDataSource1);
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
+            this.rpv1.Location = new System.Drawing.Point(0, 0);
+            this.rpv1.Name = "rpv1";
+            this.rpv1.Size = new System.Drawing.Size(676, 487);
+            this.rpv1.TabIndex = 0;
+            // 
+            // dsEQ
+            // 
+            this.dsEQ.DataSetName = "dsEQ";
+            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // taB
+            // 
+            this.taB.ClearBeforeFill = true;
+            // 
+            // taF
+            // 
+            this.taF.ClearBeforeFill = true;
+            // 
+            // taE
+            // 
+            this.taE.ClearBeforeFill = true;
+            // 
+            // taI
+            // 
+            this.taI.ClearBeforeFill = true;
+            // 
+            // taO
+            // 
+            this.taO.ClearBeforeFill = true;
+            // 
+            // taSum
+            // 
+            this.taSum.ClearBeforeFill = true;
+            // 
+            // rpt_equipmentB
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(676, 487);
+            this.Controls.Add(this.rpv1);
+            this.Name = "rpt_equipmentB";
+            this.Text = "Equipment Report (Bump)";
+            this.Load += new System.EventHandler(this.rpt_equipment_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Microsoft.Reporting.WinForms.ReportViewer rpv1;
+        private dsEQ dsEQ;
+        private dsEQTableAdapters.vEquStockBTableAdapter taB;
+        private dsEQTableAdapters.vEquStockFTableAdapter taF;
+        private dsEQTableAdapters.vEquStockMETableAdapter taE;
+        private dsEQTableAdapters.vEquStockIngTableAdapter taI;
+        private dsEQTableAdapters.vEquStockOtherTableAdapter taO;
+        private dsEQTableAdapters.vEquStockSummaryTableAdapter taSum;
+    }
+}

SubProject/FEQ0000/Equipment/rpt_equipmentAll.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FEQ0000
+{
+    public partial class rpt_equipmentAll : Form
+    {
+        dsEQ.EETGW_EquipmentDataTable dt;
+        public rpt_equipmentAll(dsEQ.EETGW_EquipmentDataTable dt_,string title)
+        {
+            //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+            InitializeComponent();
+            this.dt = dt_;
+            this.Text = "Equipment List(" + title + ")";
+        }
+
+
+
+        private void rpt_equipment_Load(object sender, EventArgs e)
+        {
+            //this.Text = string.Format("Data Report({0})", "ALL");
+            this.Show();
+            Application.DoEvents();
+
+            //데이터를 집계해서 생성해준다.
+            var dtSum = new dsEQ.vEquStockAllDataTable();
+            var grpType = this.dt.GroupBy(t => t.type);
+            foreach (var gItemType in grpType)
+            {
+                var grpManu = gItemType.GroupBy(t => t.manu);
+                foreach (var gItemM in grpManu)
+                {
+                    var grpMod = gItemM.GroupBy(t => t.model);
+                    foreach (var gItemMod in grpMod)
+                    {
+
+                        
+
+                        var grpLine = gItemMod.GroupBy(t => t.lineT + "-" + t.lineP);
+                        foreach (var gItemLine in grpLine)
+                        {
+                            var grpP1 = gItemLine.GroupBy(t => t.param1);
+                            foreach(var gItemP1 in grpP1)
+                            {
+                                var grpPlant = gItemP1.GroupBy(t => t.plant);
+                                foreach (var gItemPlant in grpPlant)
+                                {
+                                    var grpGrp2 = gItemPlant.GroupBy(t => t.grp2);
+                                    foreach (var gItemGrp2 in grpGrp2)
+                                    {
+                                        var dr = gItemGrp2.FirstOrDefault();
+                                        var newdr = dtSum.NewvEquStockAllRow();
+                                        newdr.pdate = DateTime.Now.ToShortDateString();
+                                        newdr.grp = dr.type;
+                                        newdr.manu = dr.manu;
+                                        newdr.model = dr.model;
+                                        newdr.linecode = dr.linecode;
+                                        newdr.lineT = dr.lineT;
+                                        newdr.lineP = dr.lineP;
+                                        newdr.cnt = gItemGrp2.Count();
+                                        newdr.Remark = dr.memo;
+                                        newdr.plant = dr.plant;
+                                        newdr.grp2 = dr.grp2;
+                                        dtSum.AddvEquStockAllRow(newdr);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            this.rpv1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
+            this.rpv1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
+
+            //Set DataSource
+            Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();
+            DsEQ.Name = "DataSet1";
+
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportA.rdlc";
+            DsEQ.Value = dtSum;
+
+            this.rpv1.LocalReport.DataSources.Add(DsEQ);
+            this.rpv1.RefreshReport();
+        }
+    }
+}

SubProject/FEQ0000/Equipment/rpt_equipmentAll.resx

@@ -0,0 +1,141 @@
+<?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="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>97, 17</value>
+  </metadata>
+  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>166, 17</value>
+  </metadata>
+  <metadata name="taE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>234, 17</value>
+  </metadata>
+  <metadata name="taI.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>303, 17</value>
+  </metadata>
+  <metadata name="taO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>369, 17</value>
+  </metadata>
+  <metadata name="taSum.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>441, 17</value>
+  </metadata>
+</root>

SubProject/FEQ0000/Equipment/rpt_equipmentB.cs

@@ -21,6 +21,8 @@ namespace FEQ0000
             imptype = type_;
         }
 
+      
+
         private void rpt_equipment_Load(object sender, EventArgs e)
         {
             this.Text = string.Format("Data Report({0})",this.imptype);

SubProject/FEQ0000/FEQ0000.csproj

@@ -174,6 +174,12 @@
     <Compile Include="Equipment\fImpEquipment.Designer.cs">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </Compile>
+    <Compile Include="Equipment\rpt_equipmentAll.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Equipment\rpt_equipmentAll.Designer.cs">
+      <DependentUpon>rpt_equipmentAll.cs</DependentUpon>
+    </Compile>
     <Compile Include="Equipment\rpt_equipmentSum.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -271,8 +277,12 @@
     <EmbeddedResource Include="Equipment\fImpEquipment.resx">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Equipment\ReportA.rdlc" />
     <EmbeddedResource Include="Equipment\ReportO.rdlc" />
     <EmbeddedResource Include="Equipment\ReportI.rdlc" />
+    <EmbeddedResource Include="Equipment\rpt_equipmentAll.resx">
+      <DependentUpon>rpt_equipmentAll.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Equipment\rpt_equipmentSum.resx">
       <DependentUpon>rpt_equipmentSum.cs</DependentUpon>
     </EmbeddedResource>

SubProject/FEQ0000/dsEQ.xss

@@ -4,22 +4,24 @@
      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="825" 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="972" ViewPortY="169" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:EqDateList" ZOrder="14" X="70" Y="69" Height="420" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:EqDateList" ZOrder="16" X="70" Y="69" Height="420" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:EquipmentF" ZOrder="13" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentF" ZOrder="15" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EquipmentB" ZOrder="12" X="632" Y="70" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentB" ZOrder="14" X="632" Y="70" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EquipmentME" ZOrder="11" X="918" Y="70" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentME" ZOrder="13" X="918" Y="70" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockB" ZOrder="10" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockB" ZOrder="12" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockF" ZOrder="9" X="1498" Y="70" Height="248" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockF" ZOrder="11" X="1498" Y="70" Height="248" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockME" ZOrder="8" X="1780" Y="70" Height="248" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockME" ZOrder="10" X="1780" Y="70" Height="248" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EquipmentFilter" ZOrder="7" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:EquipmentFilter" ZOrder="9" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:LineCode" ZOrder="6" X="1264" Y="689" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:LineCode" ZOrder="8" X="1264" Y="689" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:EETGW_EquipmentIng" ZOrder="5" X="476" Y="456" Height="324" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_EquipmentIng" ZOrder="7" X="476" Y="456" Height="324" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockIng" ZOrder="4" X="1865" Y="364" Height="248" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockIng" ZOrder="6" X="1865" Y="364" Height="248" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_EquipmentOther" ZOrder="3" X="823" Y="458" Height="324" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_EquipmentOther" ZOrder="5" X="823" Y="458" Height="324" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockOther" ZOrder="2" X="1333" Y="363" Height="248" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockOther" ZOrder="4" X="1333" Y="363" Height="248" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockSummary" ZOrder="1" X="1589" Y="402" Height="286" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:vEquStockSummary" ZOrder="3" X="1589" Y="402" Height="286" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:EETGW_Equipment" ZOrder="2" X="369" Y="428" Height="324" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vEquStockAll" ZOrder="1" X="1678" Y="733" Height="286" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/Project/fProjectData.Designer.cs

@@ -46,15 +46,14 @@
             System.Windows.Forms.Label label6;
             System.Windows.Forms.Label label8;
             System.Windows.Forms.Label label9;
-            System.Windows.Forms.Label label5;
             System.Windows.Forms.Label label7;
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.Label label10;
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tbIdx = new System.Windows.Forms.TextBox();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dsPRJ = new FPJ0000.dsPRJ();
             this.nameTextBox = new System.Windows.Forms.TextBox();
             this.reqstaffTextBox = new System.Windows.Forms.TextBox();
             this.tbSdate = new System.Windows.Forms.TextBox();
@@ -86,6 +85,11 @@
             this.btPath = new System.Windows.Forms.ToolStripButton();
             this.btSendMail = new System.Windows.Forms.ToolStripButton();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.bsHistWeek = new System.Windows.Forms.BindingSource(this.components);
             this.cmbProcess = new System.Windows.Forms.ComboBox();
             this.cmbState = new System.Windows.Forms.ComboBox();
             this.tbODate = new System.Windows.Forms.TextBox();
@@ -93,8 +97,8 @@
             this.cmbPart = new System.Windows.Forms.ComboBox();
             this.arLabel1 = new arCtl.arLabel();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.tbDue = new System.Windows.Forms.TextBox();
             this.checkBox2 = new System.Windows.Forms.CheckBox();
-            this.cmbCate = new System.Windows.Forms.ComboBox();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.textBox4 = new System.Windows.Forms.TextBox();
             this.tbPath = new System.Windows.Forms.TextBox();
@@ -148,6 +152,10 @@
             this.tabPage4 = new System.Windows.Forms.TabPage();
             this.arPanel4 = new arCtl.arPanel();
             this.dataGridView2 = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bsHistDay = new System.Windows.Forms.BindingSource(this.components);
             this.bindingNavigator2 = new System.Windows.Forms.BindingNavigator(this.components);
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
@@ -163,45 +171,6 @@
             this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.arLabel12 = new arCtl.arLabel();
-            this.tabPage5 = new System.Windows.Forms.TabPage();
-            this.arPanel5 = new arCtl.arPanel();
-            this.dataGridView3 = new System.Windows.Forms.DataGridView();
-            this.sort = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.sw = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ww = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.panel9 = new System.Windows.Forms.Panel();
-            this.bnTodo = new System.Windows.Forms.BindingNavigator(this.components);
-            this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
-            this.toolStripButton8 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton9 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripTextBox2 = new System.Windows.Forms.ToolStripTextBox();
-            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripButton10 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton11 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripButton12 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton14 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton15 = new System.Windows.Forms.ToolStripButton();
-            this.toolStripButton13 = new System.Windows.Forms.ToolStripButton();
-            this.tbDue = new System.Windows.Forms.TextBox();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.bsHistWeek = new System.Windows.Forms.BindingSource(this.components);
-            this.dsPRJ = new FPJ0000.dsPRJ();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bsHistDay = new System.Windows.Forms.BindingSource(this.components);
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.titleDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.processDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bsTodo = new System.Windows.Forms.BindingSource(this.components);
             this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
             this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
@@ -225,12 +194,14 @@
             label6 = new System.Windows.Forms.Label();
             label8 = new System.Windows.Forms.Label();
             label9 = new System.Windows.Forms.Label();
-            label5 = new System.Windows.Forms.Label();
             label7 = new System.Windows.Forms.Label();
             label10 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistWeek)).BeginInit();
             this.panel7.SuspendLayout();
             this.panel1.SuspendLayout();
             this.panel5.SuspendLayout();
@@ -252,18 +223,10 @@
             this.tabPage4.SuspendLayout();
             this.arPanel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).BeginInit();
             this.bindingNavigator2.SuspendLayout();
             this.tabPage2.SuspendLayout();
-            this.tabPage5.SuspendLayout();
-            this.arPanel5.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bnTodo)).BeginInit();
-            this.bnTodo.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsHistWeek)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).BeginInit();
             this.SuspendLayout();
             // 
@@ -429,16 +392,6 @@
             label9.TabIndex = 12;
             label9.Text = "CR/CF#";
             // 
-            // label5
-            // 
-            label5.AutoSize = true;
-            label5.Location = new System.Drawing.Point(212, 89);
-            label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label5.Name = "label5";
-            label5.Size = new System.Drawing.Size(29, 12);
-            label5.TabIndex = 88;
-            label5.Text = "분류";
-            // 
             // label7
             // 
             label7.AutoSize = true;
@@ -449,6 +402,16 @@
             label7.TabIndex = 89;
             label7.Text = "공정";
             // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new System.Drawing.Point(323, 144);
+            label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            label10.Name = "label10";
+            label10.Size = new System.Drawing.Size(83, 12);
+            label10.TabIndex = 90;
+            label10.Text = "CR# Due Date";
+            // 
             // tbIdx
             // 
             this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
@@ -459,6 +422,17 @@
             this.tbIdx.TabIndex = 9;
             this.tbIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // bs
+            // 
+            this.bs.DataMember = "Projects";
+            this.bs.DataSource = this.dsPRJ;
+            this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
+            // 
+            // dsPRJ
+            // 
+            this.dsPRJ.DataSetName = "dsPRJ";
+            this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // nameTextBox
             // 
             this.nameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true));
@@ -776,6 +750,46 @@
             this.dataGridView1.TabIndex = 0;
             this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick);
             // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "div";
+            this.dataGridViewTextBoxColumn1.HeaderText = "*";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            this.dataGridViewTextBoxColumn1.Width = 36;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
+            this.dataGridViewTextBoxColumn2.HeaderText = "등록일";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 72;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dataGridViewTextBoxColumn10.HeaderText = "비고";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewCheckBoxColumn2
+            // 
+            this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend";
+            this.dataGridViewCheckBoxColumn2.HeaderText = "M";
+            this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
+            this.dataGridViewCheckBoxColumn2.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn2.Width = 26;
+            // 
+            // bsHistWeek
+            // 
+            this.bsHistWeek.DataMember = "ProjectsHistory";
+            this.bsHistWeek.DataSource = this.dsPRJ;
+            // 
             // cmbProcess
             // 
             this.cmbProcess.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
@@ -889,8 +903,6 @@
             this.panel1.Controls.Add(label10);
             this.panel1.Controls.Add(this.tbDue);
             this.panel1.Controls.Add(this.checkBox2);
-            this.panel1.Controls.Add(this.cmbCate);
-            this.panel1.Controls.Add(label5);
             this.panel1.Controls.Add(this.linkLabel1);
             this.panel1.Controls.Add(label9);
             this.panel1.Controls.Add(this.textBox4);
@@ -911,6 +923,14 @@
             this.panel1.Size = new System.Drawing.Size(547, 169);
             this.panel1.TabIndex = 86;
             // 
+            // tbDue
+            // 
+            this.tbDue.Location = new System.Drawing.Point(413, 139);
+            this.tbDue.Name = "tbDue";
+            this.tbDue.Size = new System.Drawing.Size(127, 21);
+            this.tbDue.TabIndex = 91;
+            this.tbDue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            // 
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
@@ -921,19 +941,6 @@
             this.checkBox2.Text = "Fan-Out";
             this.checkBox2.UseVisualStyleBackColor = true;
             // 
-            // cmbCate
-            // 
-            this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
-            this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
-            this.cmbCate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbCate.FormattingEnabled = true;
-            this.cmbCate.Location = new System.Drawing.Point(246, 85);
-            this.cmbCate.Margin = new System.Windows.Forms.Padding(4);
-            this.cmbCate.Name = "cmbCate";
-            this.cmbCate.Size = new System.Drawing.Size(103, 20);
-            this.cmbCate.TabIndex = 89;
-            // 
             // linkLabel1
             // 
             this.linkLabel1.AutoSize = true;
@@ -968,7 +975,7 @@
             this.textBox2.ImeMode = System.Windows.Forms.ImeMode.Hangul;
             this.textBox2.Location = new System.Drawing.Point(93, 85);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(113, 21);
+            this.textBox2.Size = new System.Drawing.Size(256, 21);
             this.textBox2.TabIndex = 7;
             // 
             // arLabel2
@@ -1808,7 +1815,6 @@
             // 
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Controls.Add(this.tabPage5);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
             this.tabControl1.Name = "tabControl1";
@@ -1923,6 +1929,38 @@
             this.dataGridView2.Size = new System.Drawing.Size(472, 270);
             this.dataGridView2.TabIndex = 0;
             // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "div";
+            this.dataGridViewTextBoxColumn3.HeaderText = "*";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Visible = false;
+            this.dataGridViewTextBoxColumn3.Width = 36;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "pdate";
+            this.dataGridViewTextBoxColumn4.HeaderText = "등록일";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Width = 72;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "remark";
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dataGridViewTextBoxColumn5.HeaderText = "비고";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            // 
+            // bsHistDay
+            // 
+            this.bsHistDay.DataMember = "EETGW_ProjecthistoryD";
+            this.bsHistDay.DataSource = this.dsPRJ;
+            // 
             // bindingNavigator2
             // 
             this.bindingNavigator2.AddNewItem = null;
@@ -2105,394 +2143,6 @@
             this.arLabel12.TextShadow = true;
             this.arLabel12.TextVisible = true;
             // 
-            // tabPage5
-            // 
-            this.tabPage5.Controls.Add(this.arPanel5);
-            this.tabPage5.Location = new System.Drawing.Point(4, 22);
-            this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(1050, 653);
-            this.tabPage5.TabIndex = 2;
-            this.tabPage5.Text = "TODO";
-            this.tabPage5.UseVisualStyleBackColor = true;
-            // 
-            // arPanel5
-            // 
-            this.arPanel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.arPanel5.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.arPanel5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
-            this.arPanel5.BorderSize = new System.Windows.Forms.Padding(1);
-            this.arPanel5.Controls.Add(this.dataGridView3);
-            this.arPanel5.Controls.Add(this.panel9);
-            this.arPanel5.Controls.Add(this.bnTodo);
-            this.arPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.arPanel5.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.arPanel5.ForeColor = System.Drawing.Color.Black;
-            this.arPanel5.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            this.arPanel5.GradientRepeatBG = true;
-            this.arPanel5.Location = new System.Drawing.Point(0, 0);
-            this.arPanel5.Name = "arPanel5";
-            this.arPanel5.Padding = new System.Windows.Forms.Padding(1);
-            this.arPanel5.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
-            this.arPanel5.ProgressColor2 = System.Drawing.Color.DeepSkyBlue;
-            this.arPanel5.ProgressMax = 100F;
-            this.arPanel5.ProgressMin = 0F;
-            this.arPanel5.ProgressPadding = new System.Windows.Forms.Padding(0);
-            this.arPanel5.ProgressValue = 0F;
-            this.arPanel5.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.arPanel5.ShowBorder = true;
-            this.arPanel5.Size = new System.Drawing.Size(1050, 653);
-            this.arPanel5.TabIndex = 91;
-            this.arPanel5.Text = "arPanel5";
-            this.arPanel5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.arPanel5.TextShadow = false;
-            this.arPanel5.UseProgressBar = false;
-            // 
-            // dataGridView3
-            // 
-            this.dataGridView3.AllowUserToAddRows = false;
-            this.dataGridView3.AllowUserToResizeRows = false;
-            this.dataGridView3.AutoGenerateColumns = false;
-            this.dataGridView3.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.dataGridView3.ColumnHeadersHeight = 35;
-            this.dataGridView3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dataGridView3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.sort,
-            this.cate,
-            this.sw,
-            this.ww,
-            this.titleDataGridViewTextBoxColumn,
-            this.pdateDataGridViewTextBoxColumn,
-            this.processDataGridViewTextBoxColumn,
-            this.edateDataGridViewTextBoxColumn,
-            this.remarkDataGridViewTextBoxColumn});
-            this.dataGridView3.DataSource = this.bsTodo;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black;
-            dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(3);
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView3.DefaultCellStyle = dataGridViewCellStyle4;
-            this.dataGridView3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridView3.Location = new System.Drawing.Point(1, 158);
-            this.dataGridView3.Margin = new System.Windows.Forms.Padding(7, 3, 7, 7);
-            this.dataGridView3.Name = "dataGridView3";
-            this.dataGridView3.RowHeadersVisible = false;
-            this.dataGridView3.RowTemplate.Height = 23;
-            this.dataGridView3.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dataGridView3.Size = new System.Drawing.Size(1048, 469);
-            this.dataGridView3.TabIndex = 0;
-            // 
-            // sort
-            // 
-            this.sort.DataPropertyName = "sort";
-            this.sort.HeaderText = "순서";
-            this.sort.Name = "sort";
-            // 
-            // cate
-            // 
-            this.cate.DataPropertyName = "cate";
-            this.cate.HeaderText = "그룹";
-            this.cate.Name = "cate";
-            // 
-            // sw
-            // 
-            this.sw.DataPropertyName = "sw";
-            this.sw.HeaderText = "sw";
-            this.sw.Name = "sw";
-            // 
-            // ww
-            // 
-            this.ww.DataPropertyName = "ww";
-            this.ww.HeaderText = "ww";
-            this.ww.Name = "ww";
-            // 
-            // panel9
-            // 
-            this.panel9.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel9.Location = new System.Drawing.Point(1, 1);
-            this.panel9.Name = "panel9";
-            this.panel9.Size = new System.Drawing.Size(1048, 157);
-            this.panel9.TabIndex = 88;
-            this.panel9.Paint += new System.Windows.Forms.PaintEventHandler(this.panel9_Paint);
-            // 
-            // bnTodo
-            // 
-            this.bnTodo.AddNewItem = null;
-            this.bnTodo.BindingSource = this.bsTodo;
-            this.bnTodo.CountItem = this.toolStripLabel2;
-            this.bnTodo.DeleteItem = null;
-            this.bnTodo.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.bnTodo.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripButton8,
-            this.toolStripButton9,
-            this.toolStripSeparator4,
-            this.toolStripTextBox2,
-            this.toolStripLabel2,
-            this.toolStripSeparator5,
-            this.toolStripButton10,
-            this.toolStripButton11,
-            this.toolStripSeparator6,
-            this.toolStripButton12,
-            this.toolStripButton14,
-            this.toolStripButton15,
-            this.toolStripButton13});
-            this.bnTodo.Location = new System.Drawing.Point(1, 627);
-            this.bnTodo.MoveFirstItem = this.toolStripButton8;
-            this.bnTodo.MoveLastItem = this.toolStripButton11;
-            this.bnTodo.MoveNextItem = this.toolStripButton10;
-            this.bnTodo.MovePreviousItem = this.toolStripButton9;
-            this.bnTodo.Name = "bnTodo";
-            this.bnTodo.PositionItem = this.toolStripTextBox2;
-            this.bnTodo.Size = new System.Drawing.Size(1048, 25);
-            this.bnTodo.TabIndex = 87;
-            this.bnTodo.Text = "bindingNavigator3";
-            // 
-            // toolStripLabel2
-            // 
-            this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(27, 22);
-            this.toolStripLabel2.Text = "/{0}";
-            this.toolStripLabel2.ToolTipText = "전체 항목 수";
-            // 
-            // toolStripButton8
-            // 
-            this.toolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image")));
-            this.toolStripButton8.Name = "toolStripButton8";
-            this.toolStripButton8.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton8.Size = new System.Drawing.Size(23, 22);
-            this.toolStripButton8.Text = "처음으로 이동";
-            // 
-            // toolStripButton9
-            // 
-            this.toolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton9.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton9.Image")));
-            this.toolStripButton9.Name = "toolStripButton9";
-            this.toolStripButton9.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton9.Size = new System.Drawing.Size(23, 22);
-            this.toolStripButton9.Text = "이전으로 이동";
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
-            // 
-            // toolStripTextBox2
-            // 
-            this.toolStripTextBox2.AccessibleName = "위치";
-            this.toolStripTextBox2.AutoSize = false;
-            this.toolStripTextBox2.Font = new System.Drawing.Font("맑은 고딕", 9F);
-            this.toolStripTextBox2.Name = "toolStripTextBox2";
-            this.toolStripTextBox2.Size = new System.Drawing.Size(50, 23);
-            this.toolStripTextBox2.Text = "0";
-            this.toolStripTextBox2.ToolTipText = "현재 위치";
-            // 
-            // toolStripSeparator5
-            // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
-            // 
-            // toolStripButton10
-            // 
-            this.toolStripButton10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton10.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton10.Image")));
-            this.toolStripButton10.Name = "toolStripButton10";
-            this.toolStripButton10.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton10.Size = new System.Drawing.Size(23, 22);
-            this.toolStripButton10.Text = "다음으로 이동";
-            // 
-            // toolStripButton11
-            // 
-            this.toolStripButton11.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image")));
-            this.toolStripButton11.Name = "toolStripButton11";
-            this.toolStripButton11.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton11.Size = new System.Drawing.Size(23, 22);
-            this.toolStripButton11.Text = "마지막으로 이동";
-            // 
-            // toolStripSeparator6
-            // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
-            // 
-            // toolStripButton12
-            // 
-            this.toolStripButton12.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton12.Image")));
-            this.toolStripButton12.Name = "toolStripButton12";
-            this.toolStripButton12.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton12.Size = new System.Drawing.Size(51, 22);
-            this.toolStripButton12.Text = "추가";
-            this.toolStripButton12.Click += new System.EventHandler(this.toolStripButton12_Click);
-            // 
-            // toolStripButton14
-            // 
-            this.toolStripButton14.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton14.Image")));
-            this.toolStripButton14.Name = "toolStripButton14";
-            this.toolStripButton14.RightToLeftAutoMirrorImage = true;
-            this.toolStripButton14.Size = new System.Drawing.Size(51, 22);
-            this.toolStripButton14.Text = "삭제";
-            this.toolStripButton14.Click += new System.EventHandler(this.toolStripButton14_Click);
-            // 
-            // toolStripButton15
-            // 
-            this.toolStripButton15.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripButton15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton15.Image")));
-            this.toolStripButton15.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton15.Name = "toolStripButton15";
-            this.toolStripButton15.Size = new System.Drawing.Size(75, 22);
-            this.toolStripButton15.Text = "새로고침";
-            this.toolStripButton15.Click += new System.EventHandler(this.toolStripButton15_Click);
-            // 
-            // toolStripButton13
-            // 
-            this.toolStripButton13.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton13.Image")));
-            this.toolStripButton13.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton13.Name = "toolStripButton13";
-            this.toolStripButton13.Size = new System.Drawing.Size(51, 22);
-            this.toolStripButton13.Text = "저장";
-            this.toolStripButton13.Click += new System.EventHandler(this.toolStripButton13_Click_1);
-            // 
-            // label10
-            // 
-            label10.AutoSize = true;
-            label10.Location = new System.Drawing.Point(323, 144);
-            label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            label10.Name = "label10";
-            label10.Size = new System.Drawing.Size(83, 12);
-            label10.TabIndex = 90;
-            label10.Text = "CR# Due Date";
-            // 
-            // tbDue
-            // 
-            this.tbDue.Location = new System.Drawing.Point(413, 139);
-            this.tbDue.Name = "tbDue";
-            this.tbDue.Size = new System.Drawing.Size(127, 21);
-            this.tbDue.TabIndex = 91;
-            this.tbDue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.DataPropertyName = "div";
-            this.dataGridViewTextBoxColumn1.HeaderText = "*";
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Visible = false;
-            this.dataGridViewTextBoxColumn1.Width = 36;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate";
-            this.dataGridViewTextBoxColumn2.HeaderText = "등록일";
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Width = 72;
-            // 
-            // dataGridViewTextBoxColumn10
-            // 
-            this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1;
-            this.dataGridViewTextBoxColumn10.HeaderText = "비고";
-            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
-            this.dataGridViewTextBoxColumn10.ReadOnly = true;
-            // 
-            // dataGridViewCheckBoxColumn2
-            // 
-            this.dataGridViewCheckBoxColumn2.DataPropertyName = "mailsend";
-            this.dataGridViewCheckBoxColumn2.HeaderText = "M";
-            this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
-            this.dataGridViewCheckBoxColumn2.ReadOnly = true;
-            this.dataGridViewCheckBoxColumn2.Width = 26;
-            // 
-            // bsHistWeek
-            // 
-            this.bsHistWeek.DataMember = "ProjectsHistory";
-            this.bsHistWeek.DataSource = this.dsPRJ;
-            // 
-            // dsPRJ
-            // 
-            this.dsPRJ.DataSetName = "dsPRJ";
-            this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.DataPropertyName = "div";
-            this.dataGridViewTextBoxColumn3.HeaderText = "*";
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.Visible = false;
-            this.dataGridViewTextBoxColumn3.Width = 36;
-            // 
-            // dataGridViewTextBoxColumn4
-            // 
-            this.dataGridViewTextBoxColumn4.DataPropertyName = "pdate";
-            this.dataGridViewTextBoxColumn4.HeaderText = "등록일";
-            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-            this.dataGridViewTextBoxColumn4.ReadOnly = true;
-            this.dataGridViewTextBoxColumn4.Width = 72;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.dataGridViewTextBoxColumn5.DataPropertyName = "remark";
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dataGridViewTextBoxColumn5.HeaderText = "비고";
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            // 
-            // bsHistDay
-            // 
-            this.bsHistDay.DataMember = "EETGW_ProjecthistoryD";
-            this.bsHistDay.DataSource = this.dsPRJ;
-            // 
-            // bs
-            // 
-            this.bs.DataMember = "Projects";
-            this.bs.DataSource = this.dsPRJ;
-            this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
-            // 
-            // titleDataGridViewTextBoxColumn
-            // 
-            this.titleDataGridViewTextBoxColumn.DataPropertyName = "title";
-            this.titleDataGridViewTextBoxColumn.HeaderText = "항목";
-            this.titleDataGridViewTextBoxColumn.Name = "titleDataGridViewTextBoxColumn";
-            this.titleDataGridViewTextBoxColumn.Width = 59;
-            // 
-            // pdateDataGridViewTextBoxColumn
-            // 
-            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
-            this.pdateDataGridViewTextBoxColumn.HeaderText = "시작일";
-            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
-            this.pdateDataGridViewTextBoxColumn.Width = 72;
-            // 
-            // processDataGridViewTextBoxColumn
-            // 
-            this.processDataGridViewTextBoxColumn.DataPropertyName = "process";
-            this.processDataGridViewTextBoxColumn.HeaderText = "진행(%)";
-            this.processDataGridViewTextBoxColumn.Name = "processDataGridViewTextBoxColumn";
-            this.processDataGridViewTextBoxColumn.Width = 78;
-            // 
-            // edateDataGridViewTextBoxColumn
-            // 
-            this.edateDataGridViewTextBoxColumn.DataPropertyName = "edate";
-            this.edateDataGridViewTextBoxColumn.HeaderText = "종료일";
-            this.edateDataGridViewTextBoxColumn.Name = "edateDataGridViewTextBoxColumn";
-            this.edateDataGridViewTextBoxColumn.Width = 72;
-            // 
-            // remarkDataGridViewTextBoxColumn
-            // 
-            this.remarkDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.remarkDataGridViewTextBoxColumn.DataPropertyName = "remark";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.remarkDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
-            this.remarkDataGridViewTextBoxColumn.HeaderText = "비고";
-            this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
-            // 
             // bsTodo
             // 
             this.bsTodo.DataMember = "EETGW_ProjectToDo";
@@ -2546,10 +2196,13 @@
             this.Name = "fProjectData";
             this.Text = "프로젝트 정보 추가/편집";
             this.Load += new System.EventHandler(this.fProjectData_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistWeek)).EndInit();
             this.panel7.ResumeLayout(false);
             this.panel7.PerformLayout();
             this.panel1.ResumeLayout(false);
@@ -2580,21 +2233,11 @@
             this.arPanel4.ResumeLayout(false);
             this.arPanel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).EndInit();
             this.bindingNavigator2.ResumeLayout(false);
             this.bindingNavigator2.PerformLayout();
             this.tabPage2.ResumeLayout(false);
-            this.tabPage5.ResumeLayout(false);
-            this.arPanel5.ResumeLayout(false);
-            this.arPanel5.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bnTodo)).EndInit();
-            this.bnTodo.ResumeLayout(false);
-            this.bnTodo.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsHistWeek)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -2680,7 +2323,6 @@
         private System.Windows.Forms.ToolStripButton btwEdit;
         private System.Windows.Forms.TextBox textBox4;
         private System.Windows.Forms.LinkLabel linkLabel1;
-        private System.Windows.Forms.ComboBox cmbCate;
         private System.Windows.Forms.LinkLabel linkLabel2;
         private System.Windows.Forms.LinkLabel linkLabel3;
         private System.Windows.Forms.LinkLabel linkLabel5;
@@ -2727,35 +2369,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.TabPage tabPage5;
-        private arCtl.arPanel arPanel5;
-        private System.Windows.Forms.DataGridView dataGridView3;
-        private System.Windows.Forms.BindingNavigator bnTodo;
         private System.Windows.Forms.BindingSource bsTodo;
-        private System.Windows.Forms.ToolStripLabel toolStripLabel2;
-        private System.Windows.Forms.ToolStripButton toolStripButton8;
-        private System.Windows.Forms.ToolStripButton toolStripButton9;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
-        private System.Windows.Forms.ToolStripTextBox toolStripTextBox2;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-        private System.Windows.Forms.ToolStripButton toolStripButton10;
-        private System.Windows.Forms.ToolStripButton toolStripButton11;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
-        private System.Windows.Forms.ToolStripButton toolStripButton12;
-        private System.Windows.Forms.ToolStripButton toolStripButton14;
         private dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter taToDo;
-        private System.Windows.Forms.ToolStripButton toolStripButton15;
-        private System.Windows.Forms.ToolStripButton toolStripButton13;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sort;
-        private System.Windows.Forms.DataGridViewTextBoxColumn cate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sw;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ww;
-        private System.Windows.Forms.DataGridViewTextBoxColumn titleDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn processDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn edateDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
-        private System.Windows.Forms.Panel panel9;
         private System.Windows.Forms.TextBox tbDue;
     }
 }

SubProject/FPJ0000/Project/fProjectData.cs

@@ -34,11 +34,11 @@ namespace FPJ0000
             this.cmbProcess.ValueMember = "Value";
             this.cmbProcess.DataSource = dt_eetproc;
 
-            //분류 - 190903
+            //분류 - 190903 - -제거 210329(박성민)
-            var dt_cate = FCOMMON.DBM.getCodeTable("20", "code");
+            //var dt_cate = FCOMMON.DBM.getCodeTable("20", "code");
-            this.cmbCate.DisplayMember = "Value";
+            ////.cmbCate.DisplayMember = "Value";
-            this.cmbCate.ValueMember = "Value";
+            //this.cmbCate.ValueMember = "Value";
-            this.cmbCate.DataSource = dt_cate;
+            //this.cmbCate.DataSource = dt_cate;
 
             //공정
             var dt_status = FCOMMON.DBM.getCodeTable("01");
@@ -53,18 +53,14 @@ namespace FPJ0000
             this.cmbPart.DataSource = dt_part;
 
             this.bs.DataSource = dr;
-            if (string.IsNullOrEmpty(dr.CMP_After) == false) rtAft.Rtf = dr.CMP_After;
+
-            if (string.IsNullOrEmpty(dr.CMP_Before) == false) rtBef.Rtf = dr.CMP_Before;
-            if (string.IsNullOrEmpty(dr.CMP_Description) == false) rtDesc.Rtf = dr.CMP_Description;
-            if (string.IsNullOrEmpty(dr.CMP_Background) == false) rtBack.Rtf = dr.CMP_Background;
 
             //주간일지내역을 업데이트
             refresh_History();
 
             //일업무현황 업데이트
             this.taHistD.Fill(this.dsPRJ.EETGW_ProjecthistoryD, this.dr.idx);
-            //todo 업데이트
+
-            refreshTodo();
             try
             {
                 //if (dr.idx >= 0)
@@ -79,9 +75,14 @@ namespace FPJ0000
             this.cmbProcess.Text = dr.process;
             this.cmbState.Text = dr.status;
             this.cmbPart.Text = dr.part;
-            this.cmbCate.Text = dr.category;
+            //this.cmbCate.Text = dr.category;
             this.tbDue.Text = dr.crdue;
 
+            rtAft.Text = string.Empty;
+            rtBef.Text = string.Empty;
+            rtDesc.Text = string.Empty;
+            rtBack.Text = string.Empty;
+
             //신규데이터는 추가정보를 바로 저장할 수 없다.
             if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
             {
@@ -96,7 +97,23 @@ namespace FPJ0000
                 tabControl2.Enabled = false;
 
            
+
             }
+            else
+            {
+                //디비에서 조회한다.
+                var dtMessage = ta.GetbyIDX(dr.idx);
+                if(dtMessage.Rows.Count > 0)
+                {
+                    var dr2 = dtMessage.Rows[0] as dsPRJ.ProjectsRow;
+                    if (string.IsNullOrEmpty(dr2.CMP_After) == false) rtAft.Rtf = dr2.CMP_After;
+                    if (string.IsNullOrEmpty(dr2.CMP_Before) == false) rtBef.Rtf = dr2.CMP_Before;
+                    if (string.IsNullOrEmpty(dr2.CMP_Description) == false) rtDesc.Rtf = dr2.CMP_Description;
+                    if (string.IsNullOrEmpty(dr2.CMP_Background) == false) rtBack.Rtf = dr2.CMP_Background;
+                }
+                
+            }
+
             btIO.Enabled = btPart.Enabled;
             //btWeek.Enabled = btPart.Enabled;
             btMailAddr.Enabled = btPart.Enabled;
@@ -123,11 +140,23 @@ namespace FPJ0000
             this.dr.process = cmbProcess.Text;
             this.dr.status = cmbState.Text;
             this.dr.part = cmbPart.Text;
-            this.dr.category = cmbCate.Text;
+            //this.dr.category = cmbCate.Text;
-            this.dr.CMP_After = rtAft.Rtf;
+
-            this.dr.CMP_Before = rtBef.Rtf;
+            //신규데이터일때에만 완료 자료를 처리한다.
-            this.dr.CMP_Description = rtDesc.Rtf;
+            //if(this.dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted)
-            this.dr.CMP_Background = rtBack.Rtf;
+            //{
+                this.dr.CMP_After = rtAft.Rtf;
+                this.dr.CMP_Before = rtBef.Rtf;
+                this.dr.CMP_Description = rtDesc.Rtf;
+                this.dr.CMP_Background = rtBack.Rtf;
+            //}
+            //else
+            //{
+            //    //직접데이터를 저장한다.
+            //    var taq = new dsPRJTableAdapters.QueriesTableAdapter();
+            //    var ucnt = taq.UpdateProjectCompleteMessage(rtBack.Rtf, rtDesc.Rtf, rtBef.Rtf, rtAft.Rtf, dr.idx);
+            //}
+            
             this.dr.crdue = tbDue.Text.Trim();
 
 
@@ -428,94 +457,7 @@ namespace FPJ0000
                 this.bsHistDay.RemoveCurrent();
         }
 
-        private void toolStripButton15_Click(object sender, EventArgs e)
-        {
-            refreshTodo();
-        }
-
-        void refreshTodo()
-        {
-            taToDo.Fill(this.dsPRJ.EETGW_ProjectToDo, this.dr.idx);
-            this.dataGridView3.AutoResizeColumns();
-            updatetimetable();
-            formmatingdata();
-        }
-
-        private void toolStripButton12_Click(object sender, EventArgs e)
-        {
-            //add
-            var newdr = this.dsPRJ.EETGW_ProjectToDo.NewEETGW_ProjectToDoRow();
-            newdr.pidx = this.dr.idx;
-            newdr.wuid = FCOMMON.info.Login.no;
-            newdr.wdate = DateTime.Now;
-            this.dsPRJ.EETGW_ProjectToDo.AddEETGW_ProjectToDoRow(newdr);
-        }
 
 
-        private void toolStripButton14_Click(object sender, EventArgs e)
-        {
-            //delete
-            this.bsTodo.RemoveCurrent();
-        }
-
-
-
-        void updatetimetable()
-        {
-            this.panel9.Invalidate();
-        }
-
-        void formmatingdata()
-        {
-            //색상을 변경해준다. (그룹은 자료가 있으나, 항목에 자료가 없다면 타이틀이다)
-            foreach (DataGridViewRow dr in this.dataGridView3.Rows)
-            {
-                var o_grp = dr.Cells[1].Value;
-                var o_item = dr.Cells[4].Value;
-                var v_grp = string.Empty;
-                var v_item = string.Empty;
-                if (o_grp != null) v_grp = o_grp.ToString();
-                if (o_item != null) v_item = o_item.ToString();
-                if (v_grp.Equals("") == false && v_item.Equals(""))
-                    dr.DefaultCellStyle.BackColor = System.Drawing.Color.White;
-                else
-                    dr.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            }
-        }
-        private void toolStripButton13_Click_1(object sender, EventArgs e)
-        {
-            //save
-            try
-            {
-                this.Validate();
-                this.bsTodo.EndEdit();
-                var cnt = taToDo.Update(this.dsPRJ.EETGW_ProjectToDo);
-                this.dataGridView3.AutoResizeColumns();
-                updatetimetable();
-            }
-            catch (Exception ex)
-            {
-                FCOMMON.Util.MsgE(ex.Message);
-            }
-        }
-
-        private void panel9_Paint(object sender, PaintEventArgs e)
-        {
-            //타임테이블을 그린다.
-            e.Graphics.Clear(System.Drawing.Color.Black);
-            e.Graphics.DrawString("time table", this.Font, System.Drawing.Brushes.White, 10, 10);
-            var lst = this.dsPRJ.EETGW_ProjectToDo.Where(t => t.title == null).OrderBy(t => t.sort).ToList();
-            if (lst.Count < 1) return;
-            var strh = panel9.Height / lst.Count;
-            for (int i = 0; i < lst.Count; i++)
-            {
-                var y = strh * i;
-                e.Graphics.DrawLine(System.Drawing.Pens.Yellow, 0, y, panel9.Width, y);
-            }
-            foreach (dsPRJ.EETGW_ProjectToDoRow dr in lst)
-            {
-                e.Graphics.DrawString(dr.title, this.Font, System.Drawing.Brushes.Black, 10, 10);
-            }
-        }
     }
 }

SubProject/FPJ0000/Project/fProjectData.resx

@@ -168,10 +168,10 @@
   <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
   <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -317,9 +317,6 @@
   <metadata name="bsHistWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>449, 17</value>
   </metadata>
-  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>773, 17</value>
   </metadata>
@@ -487,118 +484,9 @@
         bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="sort.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="sw.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ww.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>173, 56</value>
   </metadata>
-  <metadata name="bnTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
-        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
-        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
-        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
-        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
-        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
-        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
-        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
-        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
-        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
-        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
-        oAc0QjgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
-        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
-        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
-        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
-        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
-        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripButton12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
-        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
-        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
-        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
-        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
-        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="toolStripButton14.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
-        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
-        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
-        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
-        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
-        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
-        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton15.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>
-  <data name="toolStripButton13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>164, 17</value>
   </metadata>

SubProject/FPJ0000/Project/fProjectList.Designer.cs

@@ -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,178 @@
             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 = "완료일";
+            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, 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(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 = 78F;
+            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+            numberCellType2.MaximumValue = 999999999999999D;
+            numberCellType2.MinimumValue = -999999999999999D;
+            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(4).CellType = textCellType3;
+            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
+            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 = 78F;
+            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 = 78F;
+            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 = 78F;
+            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 = 78F;
+            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(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 = 78F;
+            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 = 78F;
+            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 = 78F;
+            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 = 59F;
+            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;
+            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(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(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(18).CellType = textCellType13;
+            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
+            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;
@@ -1339,178 +1511,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 = "완료일";
-            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, 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(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 = 78F;
-            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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
-            numberCellType2.MaximumValue = 999999999999999D;
-            numberCellType2.MinimumValue = -999999999999999D;
-            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(4).CellType = textCellType3;
-            this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
-            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 = 78F;
-            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 = 78F;
-            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 = 78F;
-            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 = 78F;
-            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(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 = 78F;
-            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 = 78F;
-            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 = 78F;
-            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 = 59F;
-            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;
-            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(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(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(18).CellType = textCellType13;
-            this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
-            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;
@@ -1532,6 +1532,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);
@@ -1544,7 +1545,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

@@ -30,7 +30,7 @@ namespace FPJ0000
         private void __Load(object sender, EventArgs e)
         {
             //프로젝트 목록을 처리함
-            //this.tbRequest.Text = FCOMMON.info.Login.nameK;
+            this.tbRequest.Text = FCOMMON.info.Login.nameK;
             cmbDateType.SelectedIndex = 0;  //기본시작일 기준으로 한다
 
             //분류 - 190905
@@ -146,7 +146,8 @@ namespace FPJ0000
 
             //  var orgQuery = this.ta.Adapter.SelectCommand.CommandText;
 
-            string State_Select = " SELECT  *,dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory FROM  Projects";
+           
+            string State_Select = " SELECT  [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory FROM  Projects";
             string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and ";
 
             if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and ";    //삭제보기 햇을 경우

SubProject/FPJ0000/Project/fProjectList.resx

@@ -230,34 +230,34 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9S1NxGMXvfxQEKqVILGjVSl2btDRaYKAU
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iL0lIJXKQt2mzT
-        IYVKzNqmDacyLCostSk3c6WstRajstzS2dTUpS3p1V5mL9tdm9taWxnd073fXXR3+VN94HDhPuccHr48
+        1ZqrqWtnARpDMvqyapYSusukdEREY5UlpDDUVNLI9dW+YF/gCAQiKFv3dHfclCN/qtf27LZ7P8+z9z57
-        1H9jcnxE680ADNb30A8u4tTAG2joV4+FsYj+sai2b3R5qe9hBGZXGN0PwqCS6V/IVV3HI1bIiKDd0e+5
+        E/+N0fERhltB6KzvoR1cwPGBNyCpV4+FsYj+sZi6b3Rpse9RFGZXBD0PIyBSmV/IV9NpLyNkRFDu2Pd8
-        XqrN2wyDRwv9qAYnXQ3kZ23PMwgZEb3ur2Q+sHAZtP8SzHMXQCEH3nD44vy6BT0jYTLPhrJ4QsgWbzh0
+        L3HS1w6dRw3tKIljrhb+Z6PpGYSMiF73V34+MH8FVOAyzLMXQSAPznDg0tyaBaaRCD/PhbB4wsgVZ9h/
-        3icqqLTIleX0bpR2SaHqlov8lHUiKHRlCMfTUJ+ZXi2otJQoFSYZ2zTSCONYE8rO7iRBnsHxYKbAPhWC
+        wS8qqLXIFNXUDlR2S6HskYn8hHU8JHRliSQyUJ2dWimotVQo5KfKmbaRVnSMtaHqXBkf5Bj0hrIF9skw
-        fTII50wQb78ksK99khSo+kuU8rYdrOZuHfb2lKH4dAGkLVsx5A3BymuC+XuD15/iKG/xQknvqig1StkG
+        7BMhOKdDePslid2dE3yBsr9CITNsY8h7TdhlqkLpiSJI9Zsx5AvDymmc/nuD158SqNb7oKC211TqpUyL
-        Zy0kukK2SJe33XRrCfHUCmxTDPHauS8pIFtwG9g4VVsPQtErQ9W1/TjmOIItuk3sZt3GbfxGRtsHxJIr
+        sxESTTFToinYary9iER6GbZJmvfa2S9fwG/BbmBjVW/dB3lvOequ78Fhx0Fs0mxgNmrWb+E26rB9QDy1
-        cEwzuD2TETX8hEEitfay6isV0Ls1OGqvRrGugM1vzIR5mofeYfnbT9zxZTa4P8cdknOWQbZUXQpIWgtR
+        DMcUjTvTWRHDT2gk06svq7paA62bxCF7PUo1RUxhazbM0T70DkvffuKuP7vBg1n2kJwzNHKl7JZDYihG
-        pM9D/okNq2Ee7fVFUjDMBfkwKbjBPUQ2LwIxqE3ede9Ac/UlolyB62mYeN1+roAP5ErW7v4tZETU088R
+        ibYAhUfXrYQ51DcW+IJhNsiF+YKb7EPk8iIYh8roW/MOyGsvEWMLXE8jvNcdYAu4QL7KOt2/hYyIZuo5
-        SfwAE0vjcySFAJMEtcfgQa4k9ffsQkbEcfPCeE2nP1nTOY+qcz4c6Fi7l3+Eov4A0xctA1rLaFoAAAAA
+        oskfoOMZfI6mEaRTIHbqPMiXpPm+XciIOGKe9zZ0BVINXXOoO+/H3jOr9/KPEMQfxQUs/XWpP8sAAAAA
         SUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ9SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKVHYuTExciRvD
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ8SURBVDhPpZFLTBNRGIVn4Z6dexduRCSKFHcsTEzcKCtD
-        wsRE4wZMNJiwcAESA1ZMMEB9IcEoyFtQi4TWEIKBtoDQSisOpa3T0lZaoFNmOo9Op3O8LaPgwsTHyT2Z
+        4sJE4wZMNJiwcAESw0sTDBTFIMEIyFtUioTWEIKBtoClSEccSlunpVRagSkznUen0znellFwYeLj5J7M
-        uZP7nf//71D/reXRElfQfFYJjZ7b43JldazM73t1ZL9/oKTgF78vKZicPLlPxylqvtsga1oWgEZWzjvv
+        3Mn9zv//d6j/1spYwVJw9IIaspQc8EV1bfyM3/fyxGH/YEHOL35XkDM1VXzIwClqvtuk6HoagE5Wxnvv
-        GSmO8GRles1+Qf7h6MI1KWivDtJvjp3XcYryjJQmNVWCHG6GEGiBwDyDGByClmFJVgqayhNv7+wzCSQT
+        KTmG8FRZct1xWfnhiOumHHRUBJk3py4ZOEXRrwrjuiZDCTdBDDRDZJ9BCg5DT3EkKwFdE4h39/apHXDb
-        G2l62ODRcYry9hzlsso2gU1I+drAfa7H1lwl4vNXwbobwC7dAuu6iYSzhriadBaDd/g4r+MkYLBUyYjr
+        sSQzYqINnKK8vSf5tLpL4FYkfGbwn2qwPV+G2MINcJ5acMt3wS3dwY67kriCdBaFd+S0YOAkYKhQTUmb
-        YD0mJBaNiE3dgBibJVU5vXrumfzZQW4852CxpOO5Dk4o+fmzMrEIqEIeVEUacvQBPJ5+mG0OdE4w6J2O
+        4OhW7Cw2IDp9G1J0jlTljeqZZ/xnB5nx3EP5soFnOihSs/OnFWIJ0MQsqEkMlMgj0PQALHYnOidZ9M1s
-        wOoMwdFVJus4CTAZ0poqQuUcyLAWKJtDSK93QFq7B/dSF0YXYlj9JuDrpoxZP4dx1wbemh+rOk7+QrtB
+        wOYOwdldpBg4CWg1JXVNgsY7keKsULeGkdzsgLz+AJ7lboy5olj7KuLLloI5P4+JpW8YtbRpBk7+QrtJ
-        zioclC0z0rHufFUp1AAxUIMBWxTLYR5zjAhbQMAMsTsqo+8DAx2nKOf9YklTWAI/hxxpgRSsJ3A1BO/l
+        Sas81G0LktGebFU5VAspUIlBewQrYQHzrAR7QMQssSeioP89CwOnKPfDfFlXOQI/h7LRDDlYQ+AKiN5r
-        fNu+uAybP4VpXwoTNI+FkIzuqfBuwMrdoqiY9CQji73Z1GoneO9D8HQz+C+N6CMzL0cETHl34Jw/rslo
+        2bZ9MQV2fwIzvgQmGQGukIKe6fB+wGpjXkSK0/Gwqy+dWOuE4H0MgWmC8LkO/WTmlQ0R0949OOMP6wra
-        H1vZDaAbC6/TxsM9njuH4k5jkbTX70aeqLM+DosEsjMS5kl18yceTaYuzVJ76qIe8Xu1WpgD7VambpDc
+        x1f3A5i63FtMw/Feuv5YzN2QJx/021dPtDkfj0UCOVgZC6S65aOARnOXbq06e8WI+L1arOyRdhtbPUTu
-        Rf9MFE+trqzR1Ku5xzvgaKvgXlYVVuhH/1yva89csT+6xAYsrRi7fVLQP/+dXlQdrBivOy1am8p37+Lf
+        YmA2gqc2d7re3Kt7JjrgNJfyL8pzS42jf67XVeevO9qucgFrC8bvFYvG579TV/nR0onqc5Ltfsn+Xfyb
-        RFHfAYswJMpC6AkvAAAAAElFTkSuQmCC
+        KOo7Ogkkq+WJUZcAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

SubProject/FPJ0000/dsPRJ.xsd

@@ -11,79 +11,11 @@
             <MainSource>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" 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">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>DELETE FROM [Projects] WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL) OR ([userhw2] = @Original_userhw2)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_bCost = 1 AND [bCost] IS NULL) OR ([bCost] = @Original_bCost)) AND ((@IsNull_bFanOut = 1 AND [bFanOut] IS NULL) OR ([bFanOut] = @Original_bFanOut)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@IsNull_crdue = 1 AND [crdue] IS NULL) OR ([crdue] = @Original_crdue)))</CommandText>
+                    <CommandText>DELETE FROM Projects
+WHERE  (idx = @Original_idx)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usermain" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usersub" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_reqstaff" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_odate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_odate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userManager" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_part" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_part" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_costo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_costo" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_costn" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_costn" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ddate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_asset" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_isdel" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_isdel" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_path" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_path" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userhw2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_orderno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_category" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_category" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userprocess" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_bCost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_bCost" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_bFanOut" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_div" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_crdue" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="crdue" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -156,123 +88,60 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>UPDATE [Projects] SET [status] = @status, [pdate] = @pdate, [name] = @name, [usermain] = @usermain, [usersub] = @usersub, [reqstaff] = @reqstaff, [sdate] = @sdate, [edate] = @edate, [odate] = @odate, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [rev] = @rev, [pidx] = @pidx, [userManager] = @userManager, [level] = @level, [part] = @part, [process] = @process, [costo] = @costo, [costn] = @costn, [cnt] = @cnt, [remark_req] = @remark_req, [remark_ans] = @remark_ans, [ddate] = @ddate, [progress] = @progress, [import] = @import, [asset] = @asset, [isdel] = @isdel, [path] = @path, [userhw2] = @userhw2, [orderno] = @orderno, [gcode] = @gcode, [category] = @category, [userprocess] = @userprocess, [CMP_Background] = @CMP_Background, [CMP_Description] = @CMP_Description, [CMP_Before] = @CMP_Before, [CMP_After] = @CMP_After, [bCost] = @bCost, [bFanOut] = @bFanOut, [div] = @div, [crdue] = @crdue WHERE (([idx] = @Original_idx) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_usermain = 1 AND [usermain] IS NULL) OR ([usermain] = @Original_usermain)) AND ((@IsNull_usersub = 1 AND [usersub] IS NULL) OR ([usersub] = @Original_usersub)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_rev = 1 AND [rev] IS NULL) OR ([rev] = @Original_rev)) AND ((@IsNull_pidx = 1 AND [pidx] IS NULL) OR ([pidx] = @Original_pidx)) AND ((@IsNull_userManager = 1 AND [userManager] IS NULL) OR ([userManager] = @Original_userManager)) AND ((@IsNull_level = 1 AND [level] IS NULL) OR ([level] = @Original_level)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_costo = 1 AND [costo] IS NULL) OR ([costo] = @Original_costo)) AND ((@IsNull_costn = 1 AND [costn] IS NULL) OR ([costn] = @Original_costn)) AND ((@IsNull_cnt = 1 AND [cnt] IS NULL) OR ([cnt] = @Original_cnt)) AND ((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_isdel = 1 AND [isdel] IS NULL) OR ([isdel] = @Original_isdel)) AND ((@IsNull_path = 1 AND [path] IS NULL) OR ([path] = @Original_path)) AND ((@IsNull_userhw2 = 1 AND [userhw2] IS NULL) OR ([userhw2] = @Original_userhw2)) AND ((@IsNull_orderno = 1 AND [orderno] IS NULL) OR ([orderno] = @Original_orderno)) AND ([gcode] = @Original_gcode) AND ((@IsNull_category = 1 AND [category] IS NULL) OR ([category] = @Original_category)) AND ((@IsNull_userprocess = 1 AND [userprocess] IS NULL) OR ([userprocess] = @Original_userprocess)) AND ((@IsNull_bCost = 1 AND [bCost] IS NULL) OR ([bCost] = @Original_bCost)) AND ((@IsNull_bFanOut = 1 AND [bFanOut] IS NULL) OR ([bFanOut] = @Original_bFanOut)) AND ((@IsNull_div = 1 AND [div] IS NULL) OR ([div] = @Original_div)) AND ((@IsNull_crdue = 1 AND [crdue] IS NULL) OR ([crdue] = @Original_crdue)));
+                    <CommandText>UPDATE Projects
+SET        status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, 
+               wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, 
+               remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, 
+               orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, 
+               CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue
+WHERE  (idx = @Original_idx); 
 SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="name" ColumnName="name" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@name" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usermain" ColumnName="usermain" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="usersub" ColumnName="usersub" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="reqstaff" ColumnName="reqstaff" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="edate" ColumnName="edate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@edate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="odate" ColumnName="odate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@odate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="memo" ColumnName="memo" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" 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="wuid" ColumnName="wuid" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.Projects" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="rev" ColumnName="rev" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@rev" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="pidx" ColumnName="pidx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@pidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userManager" ColumnName="userManager" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="level" ColumnName="level" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@level" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="part" ColumnName="part" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@part" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="process" ColumnName="process" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@process" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costo" ColumnName="costo" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costo" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="costn" ColumnName="costn" DataSourceName="EE.dbo.Projects" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@costn" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="cnt" ColumnName="cnt" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@cnt" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_req" ColumnName="remark_req" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_req" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_req" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="remark_ans" ColumnName="remark_ans" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@remark_ans" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="remark_ans" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ddate" ColumnName="ddate" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="progress" ColumnName="progress" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@progress" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="import" ColumnName="import" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@import" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="asset" ColumnName="asset" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="isdel" ColumnName="isdel" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isdel" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="path" ColumnName="path" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(300)" DbType="AnsiString" Direction="Input" ParameterName="@path" Precision="0" ProviderType="VarChar" Scale="0" Size="300" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userhw2" ColumnName="userhw2" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="div" ColumnName="div" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(2)" DbType="AnsiString" Direction="Input" ParameterName="@div" Precision="0" ProviderType="VarChar" Scale="0" Size="2" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="crdue" ColumnName="crdue" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="crdue" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_status" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_status" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_name" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_name" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="name" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usermain" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_usermain" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usermain" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usersub" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_usersub" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="usersub" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_reqstaff" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_reqstaff" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="reqstaff" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_sdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_sdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_edate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_edate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="edate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_odate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_odate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="odate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_rev" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="rev" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_pidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pidx" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userManager" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_userManager" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userManager" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_level" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="level" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_part" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_part" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="part" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_process" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_process" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="process" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_costo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_costo" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costo" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_costn" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="@Original_costn" Precision="0" ProviderType="Float" Scale="0" Size="0" SourceColumn="costn" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ddate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ddate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ddate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_progress" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="progress" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_import" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_import" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="import" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_asset" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_isdel" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_isdel" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="isdel" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_path" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_path" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="path" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userhw2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_userhw2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="userhw2" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_orderno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_category" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_category" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_userprocess" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_bCost" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_bCost" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_bFanOut" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_div" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_div" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="div" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_crdue" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="crdue" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_crdue" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="crdue" 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>
@@ -374,7 +243,7 @@ WHERE  (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="UpdateCRDue" Modifier="Public" Name="UpdateCRDue" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="UpdateCRDue">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="UpdateCRDue" Modifier="Public" Name="UpdateCRDue" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="UpdateCRDue">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE Projects
@@ -2693,6 +2562,22 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
               </DbCommand>
             </SelectCommand>
           </DbSource>
+          <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="UpdateProjectCompleteMessage" MethodsParameterType="CLR" Modifier="Public" Name="UpdateProjectCompleteMessage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="UpdateProjectCompleteMessage">
+            <UpdateCommand>
+              <DbCommand CommandType="Text" ModifiedByUser="true">
+                <CommandText>UPDATE Projects
+SET        CMP_Background = @back, CMP_Description = @desc, CMP_Before = @bef, CMP_After = @aft
+WHERE  (idx = @idx)</CommandText>
+                <Parameters>
+                  <Parameter AllowDbNull="true" AutogeneratedName="back" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@back" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="desc" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@desc" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="bef" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@bef" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="true" AutogeneratedName="aft" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@aft" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
+                  <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                </Parameters>
+              </DbCommand>
+            </UpdateCommand>
+          </DbSource>
         </Sources>
       </DataSource>
     </xs:appinfo>
@@ -2700,7 +2585,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
   <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_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: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: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" />
@@ -2939,7 +2824,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -2983,7 +2868,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3028,7 +2913,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3144,7 +3029,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_RowEvArgName="JobReportRowChangeEvent" msprop:Generator_RowClassName="JobReportRow">
+        <xs:element name="JobReport" msprop:Generator_TableClassName="JobReportDataTable" msprop:Generator_TableVarName="tableJobReport" msprop:Generator_RowChangedName="JobReportRowChanged" msprop:Generator_TablePropName="JobReport" msprop:Generator_RowDeletingName="JobReportRowDeleting" msprop:Generator_RowChangingName="JobReportRowChanging" msprop:Generator_RowEvHandlerName="JobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportRowDeleted" msprop:Generator_RowClassName="JobReportRow" msprop:Generator_UserTableName="JobReport" msprop:Generator_RowEvArgName="JobReportRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="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" />
@@ -3269,7 +3154,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3307,7 +3192,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3423,7 +3308,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3474,7 +3359,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3487,7 +3372,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3657,7 +3542,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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">
@@ -3834,7 +3719,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3879,7 +3764,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />
@@ -3948,7 +3833,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </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_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: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: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" />
@@ -4138,7 +4023,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </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_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: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: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" />
@@ -4277,7 +4162,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid,
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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: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" />

SubProject/FPJ0000/dsPRJ.xss

@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1355" 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:ProjectsIOMap" ZOrder="4" X="366" Y="70" Height="229" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
@@ -22,7 +22,7 @@
     <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: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="49" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
+    <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>
   <Connectors />
 </DiagramLayout>