summary report 관련 데이터 업데이트

JobReportMailService/Properties/AssemblyInfo.cs

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

JobReportMailService/fScheduleDay.cs

@@ -145,10 +145,10 @@ namespace JobReportMailService
                 body.AppendLine("<td>");
                 body.AppendLine("<table border='1' cellspacing='1' cellpadding='1' style='text-align:center;'>");
                 body.AppendLine("<tr>");
-                body.AppendLine("<td rowspan='2'>No</td><td rowspan='2'>Title</td><td colspan='2'>Plan(ww)</td><td colspan='2'>Actual(ww)</td><td>진행</td>");
+                body.AppendLine("<td rowspan='2'>No</td><td rowspan='2'>Title</td><td colspan='2'>Plan(ww)</td><td colspan='2'>Actual(ww)</td><td>진행</td><td>비고</td>");
                 body.AppendLine("</tr>");
                 body.AppendLine("<tr>");
-                body.AppendLine("<td>시작</td><td>완료</td><td>시작</td><td>완료</td><td>%</td>");
+                body.AppendLine("<td>시작</td><td>완료</td><td>시작</td><td>완료</td><td>%</td><td>&nbsp;</td>");
                 body.AppendLine("</tr>");
                 var ll = row.OrderBy(t => t.seq).ToList();
                 foreach (var srow in ll)
@@ -161,6 +161,7 @@ namespace JobReportMailService
                     body.AppendLine($"<td>{srow.swa}</td>");
                     body.AppendLine($"<td>{srow.ewa}</td>");
                     body.AppendLine($"<td>{srow.progress}</td>");
+                    body.AppendLine($"<td>{srow.memo}</td>");
                     body.AppendLine($"</tr>");
                 }
                 body.AppendLine("</table>");

JobReportMailService/fScheduleDayWeek.cs

@@ -142,10 +142,10 @@ namespace JobReportMailService
                 body.AppendLine("<td>");
                 body.AppendLine("<table border='1' cellspacing='1' cellpadding='1' style='text-align:center;'>");
                 body.AppendLine("<tr>");
-                body.AppendLine("<td rowspan='2'>No</td><td rowspan='2'>Title</td><td colspan='2'>Plan(ww)</td><td colspan='2'>Actual(ww)</td><td>진행</td>");
+                body.AppendLine("<td rowspan='2'>No</td><td rowspan='2'>Title</td><td colspan='2'>Plan(ww)</td><td colspan='2'>Actual(ww)</td><td>진행</td><td>비고</td>");
                 body.AppendLine("</tr>");
                 body.AppendLine("<tr>");
-                body.AppendLine("<td>시작</td><td>완료</td><td>시작</td><td>완료</td><td>%</td>");
+                body.AppendLine("<td>시작</td><td>완료</td><td>시작</td><td>완료</td><td>%</td><td>&nbsp;</td>");
                 body.AppendLine("</tr>");
                 var ll = row.OrderBy(t => t.seq).ToList();
                 foreach (var srow in ll)
@@ -158,6 +158,7 @@ namespace JobReportMailService
                     body.AppendLine($"<td>{srow.swa}</td>");
                     body.AppendLine($"<td>{srow.ewa}</td>");
                     body.AppendLine($"<td>{srow.progress}</td>");
+                    body.AppendLine($"<td>{srow.memo}</td>");
                     body.AppendLine($"</tr>");
                 }
                 body.AppendLine("</table>");

Project/_Management/fLineCode.Designer.cs

@@ -33,8 +33,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.dsMSSQL = new Project.dsMSSQL();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -47,19 +45,22 @@
             this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.lineCodeBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton();
             this.dv = new System.Windows.Forms.DataGridView();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.dsMSSQL = new Project.dsMSSQL();
             this.ta = new Project.dsMSSQLTableAdapters.LineCodeTableAdapter();
             this.tam = new Project.dsMSSQLTableAdapters.TableAdapterManager();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.plant = 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();
             this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -102,16 +103,6 @@
             this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22);
             this.bindingNavigatorAddNewItem.Text = "새로 추가";
             // 
-            // bs
-            // 
-            this.bs.DataMember = "LineCode";
-            this.bs.DataSource = this.dsMSSQL;
-            // 
-            // dsMSSQL
-            // 
-            this.dsMSSQL.DataSetName = "dsMSSQL";
-            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -208,6 +199,7 @@
             this.dataGridViewTextBoxColumn2,
             this.dataGridViewTextBoxColumn3,
             this.dataGridViewTextBoxColumn4,
+            this.plant,
             this.except,
             this.dataGridViewTextBoxColumn5});
             this.dv.DataSource = this.bs;
@@ -218,6 +210,16 @@
             this.dv.Size = new System.Drawing.Size(588, 392);
             this.dv.TabIndex = 1;
             // 
+            // bs
+            // 
+            this.bs.DataMember = "LineCode";
+            this.bs.DataSource = this.dsMSSQL;
+            // 
+            // dsMSSQL
+            // 
+            this.dsMSSQL.DataSetName = "dsMSSQL";
+            this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
             // ta
             // 
             this.ta.ClearBeforeFill = true;
@@ -225,12 +227,16 @@
             // tam
             // 
             this.tam.BackupDataSetBeforeUpdate = false;
+            this.tam.EETGW_GroupUserTableAdapter = null;
             this.tam.InventoryTableAdapter = null;
             this.tam.ItemsTableAdapter = null;
             this.tam.LineCodeTableAdapter = this.ta;
             this.tam.ProjectsTableAdapter = null;
+            this.tam.SPMasterTableAdapter = null;
             this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            this.tam.UserGroupTableAdapter = null;
             this.tam.UsersTableAdapter = null;
+            this.tam.vGroupUserTableAdapter = null;
             // 
             // dataGridViewTextBoxColumn1
             // 
@@ -264,6 +270,12 @@
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.Width = 51;
             // 
+            // plant
+            // 
+            this.plant.DataPropertyName = "plant";
+            this.plant.HeaderText = "plant";
+            this.plant.Name = "plant";
+            // 
             // except
             // 
             this.except.DataPropertyName = "except";
@@ -291,9 +303,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -323,6 +335,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn plant;
         private System.Windows.Forms.DataGridViewCheckBoxColumn except;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
     }

Project/_Management/fLineCode.resx

@@ -198,6 +198,9 @@
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="plant.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

@@ -2448,6 +2448,8 @@ namespace Project {
             
             private global::System.Data.DataColumn columnexcept;
             
+            private global::System.Data.DataColumn columnplant;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public LineCodeDataTable() {
@@ -2545,6 +2547,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 plantColumn {
+                get {
+                    return this.columnplant;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2582,7 +2592,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) {
+            public LineCodeRow AddLineCodeRow(string code, string team, string part, string memo, string wuid, System.DateTime wdate, bool except, string plant) {
                 LineCodeRow rowLineCodeRow = ((LineCodeRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -2592,7 +2602,8 @@ namespace Project {
                         memo,
                         wuid,
                         wdate,
-                        except};
+                        except,
+                        plant};
                 rowLineCodeRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowLineCodeRow);
                 return rowLineCodeRow;
@@ -2630,6 +2641,7 @@ namespace Project {
                 this.columnwuid = base.Columns["wuid"];
                 this.columnwdate = base.Columns["wdate"];
                 this.columnexcept = base.Columns["except"];
+                this.columnplant = base.Columns["plant"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2651,6 +2663,8 @@ namespace Project {
                 base.Columns.Add(this.columnwdate);
                 this.columnexcept = new global::System.Data.DataColumn("except", typeof(bool), null, global::System.Data.MappingType.Element);
                 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.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidx}, true));
                 this.columnidx.AutoIncrement = true;
@@ -2666,6 +2680,7 @@ namespace Project {
                 this.columnwuid.AllowDBNull = false;
                 this.columnwuid.MaxLength = 20;
                 this.columnwdate.AllowDBNull = false;
+                this.columnplant.MaxLength = 10;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6220,6 +6235,22 @@ namespace Project {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string plant {
+                get {
+                    if (this.IsplantNull()) {
+                        return "";
+                    }
+                    else {
+                        return ((string)(this[this.tableLineCode.plantColumn]));
+                    }
+                }
+                set {
+                    this[this.tableLineCode.plantColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IscodeNull() {
@@ -6279,6 +6310,18 @@ namespace Project {
             public void SetexceptNull() {
                 this[this.tableLineCode.exceptColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsplantNull() {
+                return this.IsNull(this.tableLineCode.plantColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetplantNull() {
+                this[this.tableLineCode.plantColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -11402,10 +11445,11 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj
             tableMapping.ColumnMappings.Add("wuid", "wuid");
             tableMapping.ColumnMappings.Add("wdate", "wdate");
             tableMapping.ColumnMappings.Add("except", "except");
+            tableMapping.ColumnMappings.Add("plant", "plant");
             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))";
+            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.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, "", "", ""));
@@ -11419,13 +11463,13 @@ 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("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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("@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.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]" +
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant);
-                ") VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate);\r\nSELECT idx, code" +
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode WHERE (idx = SCOPE_IDENTITY())";
-                ", team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = SCOPE_IDENT" +
-                "ITY())";
             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, "", "", ""));
@@ -11433,11 +11477,12 @@ SELECT idx, pdate, uid, item, serial, dr_qty, dr_amt, cr_qty, cr_amt, memo, proj
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@except", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "except", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 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("@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.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 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));
+            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)));
-SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = @idx)";
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant 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, "", "", ""));
@@ -11445,7 +11490,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@except", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "except", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 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("@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("@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, "", "", ""));
@@ -11458,7 +11504,9 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 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("@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("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
@@ -11475,7 +11523,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
             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\r\nFROM     LineCode";
+            this._commandCollection[0].CommandText = "SELECT  idx, code, team, part, [except], memo, wuid, wdate, plant\r\nFROM     LineC" +
+                "ode";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
         }
         
@@ -11536,7 +11585,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
         [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) {
+        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) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx));
             if ((Original_code == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -11585,6 +11634,14 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                 this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_wuid));
             }
             this.Adapter.DeleteCommand.Parameters[12].Value = ((System.DateTime)(Original_wdate));
+            if ((Original_plant == null)) {
+                this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_plant));
+            }
             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)) {
@@ -11605,7 +11662,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
         [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) {
+        public virtual int Insert(string code, string team, string part, global::System.Nullable<bool> except, string memo, string wuid, System.DateTime wdate, string plant) {
             if ((code == null)) {
                 this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value;
             }
@@ -11643,6 +11700,12 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                 this.Adapter.InsertCommand.Parameters[5].Value = ((string)(wuid));
             }
             this.Adapter.InsertCommand.Parameters[6].Value = ((System.DateTime)(wdate));
+            if ((plant == null)) {
+                this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[7].Value = ((string)(plant));
+            }
             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)) {
@@ -11671,6 +11734,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                     string memo, 
                     string wuid, 
                     System.DateTime wdate, 
+                    string plant, 
                     int Original_idx, 
                     string Original_code, 
                     string Original_team, 
@@ -11679,6 +11743,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                     string Original_memo, 
                     string Original_wuid, 
                     System.DateTime Original_wdate, 
+                    string Original_plant, 
                     int idx) {
             if ((code == null)) {
                 this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value;
@@ -11717,55 +11782,69 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                 this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(wuid));
             }
             this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(wdate));
-            this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_idx));
+            if ((plant == null)) {
-            if ((Original_code == null)) {
+                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
-                this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(plant));
-                this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_code));
+            }
+            this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx));
+            if ((Original_code == null)) {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_code));
             }
             if ((Original_team == null)) {
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_team));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_team));
             }
             if ((Original_part == null)) {
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_part));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_part));
             }
             if ((Original_except.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[15].Value = ((bool)(Original_except.Value));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_except.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
             }
             if ((Original_memo == null)) {
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_memo));
+                this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_memo));
             }
             if ((Original_wuid == null)) {
                 throw new global::System.ArgumentNullException("Original_wuid");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_wuid));
+                this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_wuid));
             }
-            this.Adapter.UpdateCommand.Parameters[19].Value = ((System.DateTime)(Original_wdate));
+            this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate));
-            this.Adapter.UpdateCommand.Parameters[20].Value = ((int)(idx));
+            if ((Original_plant == null)) {
+                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_plant));
+            }
+            this.Adapter.UpdateCommand.Parameters[23].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)) {
@@ -11786,8 +11865,25 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string code, string team, string part, global::System.Nullable<bool> except, string memo, string wuid, System.DateTime wdate, 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) {
+        public virtual int Update(
-            return this.Update(code, team, part, except, memo, wuid, wdate, Original_idx, Original_code, Original_team, Original_part, Original_except, Original_memo, Original_wuid, Original_wdate, Original_idx);
+                    string code, 
+                    string team, 
+                    string part, 
+                    global::System.Nullable<bool> except, 
+                    string memo, 
+                    string wuid, 
+                    System.DateTime wdate, 
+                    string plant, 
+                    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) {
+            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);
         }
     }
     

Project/dsMSSQL.xsd

@@ -588,10 +588,10 @@ ORDER BY pdate</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="LineCodeTableAdapter" GeneratorDataComponentClassName="LineCodeTableAdapter" Name="LineCode" UserDataComponentName="LineCodeTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.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">
+              <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))</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)))</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" />
@@ -605,14 +605,16 @@ ORDER BY pdate</CommandText>
                       <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="AnsiString" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" 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_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" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate);
+                    <CommandText>INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate], [plant]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate, @plant);
-SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = SCOPE_IDENTITY())</CommandText>
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant 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" />
@@ -620,21 +622,22 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  idx, code, team, part, [except], memo, wuid, wdate
+                    <CommandText>SELECT  idx, code, team, part, [except], memo, wuid, wdate, plant
 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 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));
+                    <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)));
-SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = @idx)</CommandText>
+SELECT idx, code, team, part, [except], memo, wuid, wdate, plant 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" />
@@ -642,7 +645,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@plant" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="plant" 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" />
@@ -655,8 +659,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
                       <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="AnsiString" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="GroupWare.dbo.LineCode" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_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="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>
                 </UpdateCommand>
@@ -671,6 +677,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
               <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
               <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
               <Mapping SourceColumn="except" DataSetColumn="except" />
+              <Mapping SourceColumn="plant" DataSetColumn="plant" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -1135,7 +1142,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
@@ -1276,7 +1283,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_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" />
@@ -1347,7 +1354,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_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: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: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" />
@@ -1405,7 +1412,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_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: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: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" />
@@ -1475,7 +1482,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_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: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: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" />
@@ -1516,10 +1523,17 @@ WHERE  (idx = @idx)</CommandText>
               </xs:element>
               <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
               <xs:element name="except" msprop:Generator_ColumnVarNameInTable="columnexcept" msprop:Generator_ColumnPropNameInRow="except" msprop:Generator_ColumnPropNameInTable="exceptColumn" msprop:Generator_UserColumnName="except" type="xs:boolean" minOccurs="0" />
+              <xs:element name="plant" msprop:nullValue="" msprop:Generator_ColumnPropNameInRow="plant" msprop:Generator_ColumnVarNameInTable="columnplant" msprop:Generator_ColumnPropNameInTable="plantColumn" msprop:Generator_UserColumnName="plant" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="10" />
+                  </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_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: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:complexType>
             <xs:sequence>
               <xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept">
@@ -1548,7 +1562,7 @@ WHERE  (idx = @idx)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_RowClassName="SPMasterRow" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent">
+        <xs:element name="SPMaster" msprop:Generator_TableClassName="SPMasterDataTable" msprop:Generator_TableVarName="tableSPMaster" msprop:Generator_TablePropName="SPMaster" msprop:Generator_RowDeletingName="SPMasterRowDeleting" msprop:Generator_RowChangingName="SPMasterRowChanging" msprop:Generator_RowEvHandlerName="SPMasterRowChangeEventHandler" msprop:Generator_RowDeletedName="SPMasterRowDeleted" msprop:Generator_UserTableName="SPMaster" msprop:Generator_RowChangedName="SPMasterRowChanged" msprop:Generator_RowEvArgName="SPMasterRowChangeEvent" msprop:Generator_RowClassName="SPMasterRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -1664,7 +1678,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_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: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: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" />
@@ -1691,9 +1705,9 @@ WHERE  (idx = @idx)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
-              <xs:element name="useJobReport" msprop:Generator_ColumnVarNameInTable="columnuseJobReport" msprop:Generator_ColumnPropNameInRow="useJobReport" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="useJobReportColumn" msprop:Generator_UserColumnName="useJobReport" type="xs:boolean" minOccurs="0" />
+              <xs:element name="useJobReport" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="useJobReport" msprop:Generator_ColumnVarNameInTable="columnuseJobReport" msprop:Generator_ColumnPropNameInTable="useJobReportColumn" msprop:Generator_UserColumnName="useJobReport" type="xs:boolean" minOccurs="0" />
-              <xs:element name="useUserState" msprop:Generator_ColumnVarNameInTable="columnuseUserState" msprop:Generator_ColumnPropNameInRow="useUserState" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="useUserStateColumn" msprop:Generator_UserColumnName="useUserState" type="xs:boolean" minOccurs="0" />
+              <xs:element name="useUserState" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="useUserState" msprop:Generator_ColumnVarNameInTable="columnuseUserState" msprop:Generator_ColumnPropNameInTable="useUserStateColumn" msprop:Generator_UserColumnName="useUserState" type="xs:boolean" minOccurs="0" />
-              <xs:element name="state" msprop:Generator_ColumnVarNameInTable="columnstate" msprop:Generator_ColumnPropNameInRow="state" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="stateColumn" msprop:Generator_UserColumnName="state" minOccurs="0">
+              <xs:element name="state" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="state" msprop:Generator_ColumnVarNameInTable="columnstate" msprop:Generator_ColumnPropNameInTable="stateColumn" msprop:Generator_UserColumnName="state" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -1703,7 +1717,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_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: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:complexType>
             <xs:sequence>
               <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">
@@ -1819,7 +1833,7 @@ WHERE  (idx = @idx)</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
+              <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />

Project/dsMSSQL.xss

@@ -6,16 +6,16 @@
 </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">
   <Shapes>
-    <Shape ID="DesignTable:Users" ZOrder="4" X="998" Y="60" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
+    <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" />
-    <Shape ID="DesignTable:Items" ZOrder="3" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:Items" ZOrder="4" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:Inventory" ZOrder="9" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
-    <Shape ID="DesignTable:LineCode" ZOrder="8" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
+    <Shape ID="DesignTable:LineCode" ZOrder="1" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
-    <Shape ID="DesignTable:UserGroup" ZOrder="6" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
+    <Shape ID="DesignTable:UserGroup" ZOrder="7" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
-    <Shape ID="DesignTable:SPMaster" ZOrder="5" X="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:SPMaster" ZOrder="6" X="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EETGW_GroupUser" ZOrder="1" X="861" Y="34" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:EETGW_GroupUser" ZOrder="2" X="861" Y="34" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vGroupUser" ZOrder="2" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vGroupUser" ZOrder="3" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="7" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignSources:QueriesTableAdapter" ZOrder="8" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

Project/fMain.Designer.cs

@@ -72,6 +72,7 @@
             this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.잉여장비ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.otherToolStripMenuItem = 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();
@@ -111,6 +112,7 @@
             this.임의테이블조작ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.accessDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
@@ -119,7 +121,7 @@
             this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.accessDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.summaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -436,6 +438,8 @@
             this.dataMoldEOLToolStripMenuItem,
             this.dataToolStripMenuItem,
             this.잉여장비ToolStripMenuItem,
+            this.otherToolStripMenuItem,
+            this.summaryToolStripMenuItem,
             this.toolStripMenuItem2,
             this.라인코드관리ToolStripMenuItem});
             this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
@@ -446,40 +450,47 @@
             // dataFOLToolStripMenuItem
             // 
             this.dataFOLToolStripMenuItem.Name = "dataFOLToolStripMenuItem";
-            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataFOLToolStripMenuItem.Text = "FOL";
             this.dataFOLToolStripMenuItem.Click += new System.EventHandler(this.dataFOLToolStripMenuItem_Click);
             // 
             // dataMoldEOLToolStripMenuItem
             // 
             this.dataMoldEOLToolStripMenuItem.Name = "dataMoldEOLToolStripMenuItem";
-            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataMoldEOLToolStripMenuItem.Text = "MOLD & EOL";
             this.dataMoldEOLToolStripMenuItem.Click += new System.EventHandler(this.dataMoldEOLToolStripMenuItem_Click);
             // 
             // dataToolStripMenuItem
             // 
             this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
-            this.dataToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataToolStripMenuItem.Text = "BUMP";
             this.dataToolStripMenuItem.Click += new System.EventHandler(this.dataToolStripMenuItem_Click);
             // 
             // 잉여장비ToolStripMenuItem
             // 
             this.잉여장비ToolStripMenuItem.Name = "잉여장비ToolStripMenuItem";
-            this.잉여장비ToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.잉여장비ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.잉여장비ToolStripMenuItem.Text = "잉여장비";
             this.잉여장비ToolStripMenuItem.Click += new System.EventHandler(this.잉여장비ToolStripMenuItem_Click);
             // 
+            // otherToolStripMenuItem
+            // 
+            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);
+            // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(159, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
             // 
             // 라인코드관리ToolStripMenuItem
             // 
             this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem";
-            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.라인코드관리ToolStripMenuItem.Text = "라인코드관리";
             this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click);
             // 
@@ -792,6 +803,13 @@
             this.mailBackupToolStripMenuItem.Text = "Mail Backup";
             this.mailBackupToolStripMenuItem.Click += new System.EventHandler(this.mailBackupToolStripMenuItem_Click);
             // 
+            // accessDBToolStripMenuItem
+            // 
+            this.accessDBToolStripMenuItem.Name = "accessDBToolStripMenuItem";
+            this.accessDBToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
+            this.accessDBToolStripMenuItem.Text = "Access DB";
+            this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click);
+            // 
             // tabControl1
             // 
             this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -886,12 +904,12 @@
             this.toolStripButton2.Text = "품목정보";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
             // 
-            // accessDBToolStripMenuItem
+            // summaryToolStripMenuItem
             // 
-            this.accessDBToolStripMenuItem.Name = "accessDBToolStripMenuItem";
+            this.summaryToolStripMenuItem.Name = "summaryToolStripMenuItem";
-            this.accessDBToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
+            this.summaryToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.accessDBToolStripMenuItem.Text = "Access DB";
+            this.summaryToolStripMenuItem.Text = "Summary";
-            this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click);
+            this.summaryToolStripMenuItem.Click += new System.EventHandler(this.summaryToolStripMenuItem_Click);
             // 
             // fMain
             // 
@@ -1015,6 +1033,8 @@
         private System.Windows.Forms.ToolStripMenuItem 잉여장비ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 품목검색ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem accessDBToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem otherToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem summaryToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -136,7 +136,8 @@ namespace Project
             {
                 WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
                 Console.WriteLine("start webapp");
-            }catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 Console.WriteLine(ex.Message);
             }
@@ -1156,5 +1157,19 @@ namespace Project
             var f = new Dialog.AccessDB();
             f.ShowDialog();
         }
+
+        private void otherToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "OTHEREQ";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.OTHER), "K3/K5");
+        }
+
+        private void summaryToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "EQSUM";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FEQ0000.fEquipmentSummary(), "장비전체요약");
+        }
     }
 }

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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB
-        QwoXhVCNrK1o6oJog+iDkJrIvjRlkJT0AtZlMELoPYpYM9q3BcGmjtjm3e56OT3nd68sUaEHLvtw73nO
+        QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQYgTUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z
-        ec45U/87WUP5vhpqTn4L8tgpQ/1+bKg/7uuNRz4eyxgqT0C+9wgWgmewOHgOS2E/5B3cz9aOsHnnm1Qu
+        nnPO1P9OzlC+r4aal9+iPHbaUL9nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn
-        17oVC4HTKF73ozQSQCm0C8uRVvycHUA1uMGC7CYVSxvKyp86hmKkHz+utMOKemCP7EB9zHl+JQdhX11n
+        W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss
-        QbZJTYu0+uLAWZRuB1AJb0PdBdpTu1F71oXqq6Owc6Mov21evYDMBC8NnUd5IojaLY8DTLSh+vwQrHQP
+        yDWpaZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg
-        rC8n9WN/H0f5vaexgDdTNpkJtoe3a3DtSQesj14N+pb24v7LboSSbRj9MIQtsX9OoGG8mbJXmGtmN6zM
+        fjmtH/v7OCrvPY0FvJmyyUywPbxTg60nHTA/ejXoW8aLhy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn
-        CSwLePpFF3yzO9HxqAV7HzYj+i6EzRPuAkbFTIs3LqByraXBLODC5x7cTO1Bpws8Hg+gbzyBuPkJBy7N
+        sCLg6Rdd8M3tRsfjFuyfbUb0XQhbJ9wFjIqZlm5dQvVGS4NZwMXPPbid3odOF3gyHkDfeALx5CccujLj
-        OAuYM6OqxC5rw3gzZZOZ4H0CPHjvMPruJDBpZjBlzuPu04yzQNh9LAlzZlRk14a5sslMcDie1MDo5Bv0
+        LGDOjKoau6oN482UTWaCDwjw8IOj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv
-        RkwBx2v7+2de07w5NowlYc6Mim7TMN5M2WQm2D+c0sDOiw/atXSOKCiwnmyYvl1yJjvdpmG8mbLJTLAL
+        JCnguHWwf+Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/KhdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw
-        a4wssNlt1lPLl5JwAaPS7GIY2Sl7FfPK8H7+MdhtXU9pGEvCnBkV3XYMW4edw/hEhf5jsNusJxvGkjBn
+        xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm
-        Os1HG7ZmlPoLbev0XNP6gcQAAAAASUVORK5CYII=
+        03y0YetGqb9hx/RWhn9qhQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKTSURBVDhPlVJRSFNRGL5PEVE91Us99ZTWU0S3iCJoYL1F
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKTSURBVDhPlVJRSFNRGL5PEVE91Us99aTWU0S3iCJK0N6i
-        DyFUNBhsDae06RTFzblwa07H7nRzy+nkMq/UZjYdhMoe3HQup4boQJlgir71JAxCtvo653gTpaL64HDh
+        hxAqGgy2hlPadIri5ly4Nadjd7q55XRymVdqM5sOQmUPbjqX00J0oEwwRd96EgYhW32dc7yJUlF9cLjw
-        O/f7/+/7/8P9CS+k29CFr+NJsBwK/4VvMv3vUA6UF2OfevA2K+CO5/z/F3guXsW7RS+kjy4o3Gch01w4
+        nfv9//f9/+H+hOfSLWhD1/A4UIY7vgvfZPrfoRgsKUQ/9eJNRsBt9/n/L/BMvIK3Hz2QPjhR7joLmeZC
-        HEYoFEJvby98Pt9TLp1Og57p6WlMTU3BIN1FlXgLpveP8GZeQCjtwLOBm7hmP43LrafYv8ViETs7OxAE
+        oRCCwSD6+vrg9XqfcKlUCvTMzMxgenoaeukuqsWbML57iNcLAoIpO54O3sBV22lcajvF/i0UCtjZ2YEg
-        IcfNzMygVCphb2+PHfXAFVjjjxGZ90BIGGH7UIWeZCuUogKXLGdKu7u7WFtbQ0dHx+f29vYqLpVKMWJ7
+        CFludnYWxWIRe3t77KgGL8MSe4TwghtC3ADr+2r0JtqgEMtx0XymuLu7i7W1NXR2dn7u6Oio5pLJJCO2
-        exuZTAZbW1uoDJTBGH0AMeOEP/USqnAFcVWJ4eFh5HI5RKNRELFCTsVxiUQCs7OziMfjfDKZxMjICH9P
+        t7eRTqextbWFKn8pDJH7ENMO+JIvoAxVEFdVGBkZQTabRSQSARGXy6k4Lh6PY25uDrFYjE8kEhgdHeUr
-        OAetVAGNdB/l5hNpKu7q6uIlSWL5bTZbmSznuPHxcSwvL7MZbGxsYHJyEvn1PPhXx/HQd+Og8+DgIJaW
+        hXPQSBVQS/dQZjqRouLu7m5ekiSW32q1lspyjpuYmMDy8jKbwcbGBqamppBbz4F/eRwPvNcPOg8NDWFp
-        lmh3WCyWk7J8H7FYDIVCARMTEyBd+LGxMQSDQZ7adblcPBU7HA6+r68PLS0tB1s5QCQSMWWzWeTzeVDx
+        aYl2h9lsPinL9xGNRpHP5zE5OQnShR8fH0cgEOCpXafTyVOx3W7n+/v70draerCVA4TDYWMmk0EulwMV
-        6uoqCIeVlRXQ1dHOpCAWFhbQ2Nj4XZYdhSiK6O/vRyAQQHd3N9xuN5xOJ80Lq9VKbWN0dBRGo/H3Bf4G
+        r66ugnBYWVkBXR3tTApicXERTU1N32XZUYiiiIGBAfj9fvT09MDlcsHhcNC8sFgs1DbGxsZgMBh+X+Bv
-        UuBYXV0dqqurv8jUPkiui68J/H4/nTTNTPOira2NdW1ubkZDQwNqa2tZdq1WW2DCnyBrMdGvx+PRd3Z2
+        IAWO1dfXo6am5otM7YPkKnlF4PP56KRpZpoX7e3trGtLSwsaGxtRV1fHsms0mjwT/gRZi5F+3W63rqur
-        bhKxnl0cgsFg0NfU1GzqdDq9RqP5KtP78Hq9JvIs2brm5uYwNDTEJt3U1IT6+noQMYhB9ozJ+4dSqVyX
+        a5OIdeziEPR6va62tnZTq9Xq1Gr1V5neh8fjMZJnydY1Pz+P4eFhNunm5mY0NDSAiEEMsmdM3j8UCsW6
-        pUdht9vZsMxm8y8OiG29Wq2GSqU6tEKO+wE7gsI55vmz7AAAAABJRU5ErkJggg==
+        LD0Km83GhmUymX5xQGzrVCoVlErloRVy3A8sRMI1VOLCmwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJNnGIZ7umTxgIVVJv1Rd8BgW2I2E2bc
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJtlGIZ7amJ2gGEVR382PUBQk0WXoNmy
-        gS4iyUDFVcaPVD8QSsvP5uqoWMbopKUttED5KVBmZCtlaFmzKVIdikSXJZsmm8F1pptaw9zKwrIzEuJ2
+        qBkjCtuYHfIzOj4YlJYfnZ10WGTU0dIWWqD8FCguQ0sRVtboZHSKQ7IZE90SXZh1qc51wWkxGM9IyPSy
-        rbzWRMmyO7lPnjz39T3v876fbKBCzWp7y9X0SSp6Dirp1irpLFPgKk3HWbwOe9E6rIXP8ZEmjZa9axGA
+        vOuSjRjv5D558tzX97zP+36ywUo16+2tUNMvqegtV9KjVdJVpsBVmo6zeBP2ok1YCx/jPU0arfsfRQD+
-        P752/7evdLAw2078kpPfL9i5f87Gr2eOMx+ycO90M80FcgGYj3x+hPisldh44UOP7eOu/y1unyzgF98u
+        +Mr9377YydJ8B/ELTn7/zM7tczZ+PXuCxZCFW6dbaCmQC8Bi5MxR4vNWYhOFdz1+gJv+17hxqoCffXuI
-        on1vcqsrl4hzBzdbt/GTS8Mdv5mmbfIHCYCqZNK2U3wx3LiZyaOvYspLJXh4E2P1mxgxvMxQ1Uui5tZm
+        9r/K9e5cIs5dXGt7kR9dGn7xm2neKb+TAKhKpm27xRfDTduYPvYcprxUgke2Mt6wlVHDMwxXPy1qbm0m
-        Yi/O4AdfA8GGHI7terZftiKvpL52faSKuVPvM1H3vGj+RLeB4Yr19B9Q07VfJWqtGiWfWvZz1XkwEU5Z
+        9uIMvvc1EmzM4Z09Gwdka/JK6stXRqtZmHybqfonRPMHui2MVG5m4JCa7oMqUWvTKPnQcpBLzvJEOGXp
-        OJyzJkUAeiXF1jFTNve/aiPU+JpoHixfT0+Zio5iFbZCpai1aDbwXd97fKzPpiHvmRIRfqRurWL0kmsf
+        SM6GFAHokxTbx03Z3P68nVDT86J5qGIzvWUqOotV2AqVotaq2cK3/W/xvj6bxrxHSkT4nnq0irELrgN8
-        3/gMzAzUMeUx8GWXnpBbz+n2aj5z6Jh01fBFYx6m/NTLydhD9Royn+6XlCFLmeJBR17636uvamXbTbvl
+        7TMwN1jPjMfAJ916Qm49pztq+MihY9pVy8dNeZjyU79Mxu6qz5D58ICkDB0vU9zpfCX97/VXtbbt5r3y
-        K2fmaH7qP5a9ae5kVCbzVaSnDEjqP4NN25n16p7wTL+O6T4d53uqONddyZnOSiacEr21W2gpkB8XgIED
+        tTNzLD/1H8v+NHcyKpP5KtNTBiX1n8Hml5j36h7w3ICO2X4d53urOddTxdmuKqacEn11L9BaID8hAIOH
-        quhE8w6uDNUQPLKZ8foXGavLwl+bxUlDFsO6TLyHXsAjZeDSZjBk3MmoTaKzOjsxkTwk6ypL+2suaCJo
+        VNGpll1cHK4leHQbEw1PMV6fhb8ui1OGLEZ0mXgPP4lHysClzWDYuJsxm0RXTXZiInlI1l2W9tdC0ETQ
-        fIXR6o1iWf/npt0K3IY3ONVeI44kAPdm7MTONnJ74l1+Hq8lGtBxa+QQPw5rmfOWcMNTyPeuPVy353Ot
+        +CxjNY+LZf2fm/cqcBteZrKjVhxJAG7N2Yl92sSNqTf5aaKOaEDH9dHD/DCiZcFbwlVPId+59nHFns/l
-        NZdvLYkHNWxa2UcScLEtESolcmIPJ3pseDwe4WnH21y15PDhB2aMRiN6vZ6FaKnwTZ9JTCQAd89bmZ92
+        tly+sSQe1IhpbR9JwBftiVApkZP7ONlrw+PxCM86XueSJYfj75oxGo3o9XqWoqXC13wmMZEA3DxvZXHW
-        EAu3EfB1EovFiEQi+P1+HA4H4XCYpaUlKivKuTHYIMJPAB7/41z1uUxNTRGPx1leXhZeXFwkEAig07wu
+        QSzcTsDXRSwWIxKJ4Pf7cTgchMNhVlZWqKqs4OpQowg/ALj/j3M15DIzM0M8Hmd1dVV4eXmZQCCATrND
-        xn58J+ImVstqtb5jNpujj8aWJOm3oqKiQY1G81SyJSmZ7F+3njVe+vTqWgAAAABJRU5ErkJggg==
+        jH3/TsRNrJfVan3DbDZH740tSdJvRUVFQxqN5qFkS1Iy2b+oGDVYvNay8wAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

SubProject/FEQ0000/Equipment/ReportB.rdlc

@@ -8,7 +8,7 @@
             <TablixCornerRow>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox7">
+                  <Textbox Name="Textbox2">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -28,7 +28,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox7</rd:DefaultName>
+                    <rd:DefaultName>Textbox2</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -42,12 +42,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox19">
+                  <Textbox Name="Textbox3">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -68,7 +68,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox19</rd:DefaultName>
+                    <rd:DefaultName>Textbox3</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -82,12 +82,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox4">
+                  <Textbox Name="Textbox5">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -107,7 +107,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox4</rd:DefaultName>
+                    <rd:DefaultName>Textbox5</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -121,12 +121,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox30">
+                  <Textbox Name="Textbox6">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -146,7 +146,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox30</rd:DefaultName>
+                    <rd:DefaultName>Textbox6</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -160,7 +160,7 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
             </TablixCornerRow>
@@ -170,6 +170,12 @@
               <TablixCornerCell />
               <TablixCornerCell />
             </TablixCornerRow>
+            <TablixCornerRow>
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+            </TablixCornerRow>
           </TablixCornerRows>
         </TablixCorner>
         <TablixBody>
@@ -177,6 +183,9 @@
             <TablixColumn>
               <Width>1.65273cm</Width>
             </TablixColumn>
+            <TablixColumn>
+              <Width>1.01833cm</Width>
+            </TablixColumn>
             <TablixColumn>
               <Width>1.12416cm</Width>
             </TablixColumn>
@@ -227,6 +236,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox18">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>#4c68a2</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox18</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>WhiteSmoke</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt1">
@@ -349,6 +397,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox20">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox20</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>#7292cc</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt5">
@@ -432,6 +519,56 @@
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="plant">
+                <GroupExpressions>
+                  <GroupExpression>=Fields!plant.Value</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!plant.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>0.6cm</Size>
+                <CellContents>
+                  <Textbox Name="plant">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>=Fields!plant.Value</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>plant</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Color>#e0e0e0</Color>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
               <TablixMembers>
                 <TablixMember>
                   <Group Name="team">
@@ -543,7 +680,7 @@
                   <TablixHeader>
                     <Size>1.2cm</Size>
                     <CellContents>
-                  <Textbox Name="Textbox16">
+                      <Textbox Name="Textbox15">
                         <CanGrow>true</CanGrow>
                         <KeepTogether>true</KeepTogether>
                         <Paragraphs>
@@ -563,7 +700,49 @@ Total</Value>
                             </Style>
                           </Paragraph>
                         </Paragraphs>
-                    <rd:DefaultName>Textbox16</rd:DefaultName>
+                        <rd:DefaultName>Textbox15</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Color>#e0e0e0</Color>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>1.8cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox12">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>Total</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox12</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -582,9 +761,9 @@ Total</Value>
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>1.2cm</Size>
+                <Size>1.8cm</Size>
                 <CellContents>
-                  <Textbox Name="Textbox1">
+                  <Textbox Name="Textbox13">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -603,7 +782,7 @@ Total</Value>
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox1</rd:DefaultName>
+                    <rd:DefaultName>Textbox13</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -1007,9 +1186,13 @@ Total</Value>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
+        <RepeatColumnHeaders>true</RepeatColumnHeaders>
+        <RepeatRowHeaders>true</RepeatRowHeaders>
+        <FixedColumnHeaders>true</FixedColumnHeaders>
+        <FixedRowHeaders>true</FixedRowHeaders>
         <DataSetName>DataSet1</DataSetName>
-        <Height>2.4cm</Height>
+        <Height>3cm</Height>
-        <Width>18.71646cm</Width>
+        <Width>19.73479cm</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1019,10 +1202,10 @@ Total</Value>
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>0.94488in</Height>
+    <Height>1.1811in</Height>
     <Style />
   </Body>
-  <Width>7.68119in</Width>
+  <Width>8.35294in</Width>
   <Page>
     <PageHeight>29.7cm</PageHeight>
     <PageWidth>21cm</PageWidth>
@@ -1086,10 +1269,14 @@ Total</Value>
           <DataField>Remark</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="plant">
+          <DataField>plant</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>dsEQ</rd:DataSetName>
-        <rd:SchemaPath>D:\Source\GroupWare\EET_GroupWare_180713_0000\Project\dsEQ.xsd</rd:SchemaPath>
+        <rd:SchemaPath>D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FEQ0000\dsEQ.xsd</rd:SchemaPath>
         <rd:TableName>vEquStockB</rd:TableName>
         <rd:TableAdapterFillMethod>Fill</rd:TableAdapterFillMethod>
         <rd:TableAdapterGetDataMethod>GetData</rd:TableAdapterGetDataMethod>

SubProject/FEQ0000/Equipment/ReportE.rdlc

@@ -8,7 +8,7 @@
             <TablixCornerRow>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox7">
+                  <Textbox Name="Textbox6">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -28,7 +28,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox7</rd:DefaultName>
+                    <rd:DefaultName>Textbox6</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -42,12 +42,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox19">
+                  <Textbox Name="Textbox8">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -68,7 +68,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox19</rd:DefaultName>
+                    <rd:DefaultName>Textbox8</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -82,12 +82,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox4">
+                  <Textbox Name="Textbox12">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -107,7 +107,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox4</rd:DefaultName>
+                    <rd:DefaultName>Textbox12</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -121,12 +121,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox30">
+                  <Textbox Name="Textbox13">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -146,7 +146,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox30</rd:DefaultName>
+                    <rd:DefaultName>Textbox13</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -160,7 +160,7 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
             </TablixCornerRow>
@@ -170,6 +170,12 @@
               <TablixCornerCell />
               <TablixCornerCell />
             </TablixCornerRow>
+            <TablixCornerRow>
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+            </TablixCornerRow>
           </TablixCornerRows>
         </TablixCorner>
         <TablixBody>
@@ -177,6 +183,9 @@
             <TablixColumn>
               <Width>0.96481cm</Width>
             </TablixColumn>
+            <TablixColumn>
+              <Width>0.93896cm</Width>
+            </TablixColumn>
             <TablixColumn>
               <Width>0.93895cm</Width>
             </TablixColumn>
@@ -227,6 +236,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox22">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>#4c68a2</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox22</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>WhiteSmoke</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt1">
@@ -349,6 +397,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox24">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox24</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>#7292cc</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt5">
@@ -432,6 +519,56 @@
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="plant">
+                <GroupExpressions>
+                  <GroupExpression>=Fields!plant.Value</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!plant.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>0.6cm</Size>
+                <CellContents>
+                  <Textbox Name="plant">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>=Fields!plant.Value</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>plant</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Color>#e0e0e0</Color>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
               <TablixMembers>
                 <TablixMember>
                   <Group Name="team">
@@ -542,7 +679,7 @@
                   <TablixHeader>
                     <Size>1.2cm</Size>
                     <CellContents>
-                  <Textbox Name="Textbox16">
+                      <Textbox Name="Textbox20">
                         <CanGrow>true</CanGrow>
                         <KeepTogether>true</KeepTogether>
                         <Paragraphs>
@@ -562,7 +699,49 @@ Total</Value>
                             </Style>
                           </Paragraph>
                         </Paragraphs>
-                    <rd:DefaultName>Textbox16</rd:DefaultName>
+                        <rd:DefaultName>Textbox20</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Color>#e0e0e0</Color>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>1.8cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox15">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>Total</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox15</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -581,9 +760,9 @@ Total</Value>
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>1.2cm</Size>
+                <Size>1.8cm</Size>
                 <CellContents>
-                  <Textbox Name="Textbox1">
+                  <Textbox Name="Textbox17">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -602,7 +781,7 @@ Total</Value>
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox1</rd:DefaultName>
+                    <rd:DefaultName>Textbox17</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -1006,9 +1185,11 @@ Total</Value>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
+        <RepeatRowHeaders>true</RepeatRowHeaders>
+        <FixedRowHeaders>true</FixedRowHeaders>
         <DataSetName>DataSet1</DataSetName>
-        <Height>2.4cm</Height>
+        <Height>3cm</Height>
-        <Width>17.84334cm</Width>
+        <Width>18.78229cm</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1018,7 +1199,7 @@ Total</Value>
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>0.94488in</Height>
+    <Height>1.1811in</Height>
     <Style />
   </Body>
   <Width>10.80859in</Width>
@@ -1204,10 +1385,14 @@ Total</Value>
           <DataField>Remark</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="plant">
+          <DataField>plant</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>dsEQ</rd:DataSetName>
-        <rd:SchemaPath>D:\Source\GroupWare\EET_GroupWare_180713_0000\Project\dsEQ.xsd</rd:SchemaPath>
+        <rd:SchemaPath>D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FEQ0000\dsEQ.xsd</rd:SchemaPath>
         <rd:TableName>vEquStockB</rd:TableName>
         <rd:TableAdapterFillMethod>Fill</rd:TableAdapterFillMethod>
         <rd:TableAdapterGetDataMethod>GetData</rd:TableAdapterGetDataMethod>

SubProject/FEQ0000/Equipment/ReportF.rdlc

@@ -8,7 +8,7 @@
             <TablixCornerRow>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox7">
+                  <Textbox Name="Textbox6">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -28,7 +28,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox7</rd:DefaultName>
+                    <rd:DefaultName>Textbox6</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -42,12 +42,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox19">
+                  <Textbox Name="Textbox8">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -68,7 +68,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox19</rd:DefaultName>
+                    <rd:DefaultName>Textbox8</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -82,12 +82,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox4">
+                  <Textbox Name="Textbox12">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -107,7 +107,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox4</rd:DefaultName>
+                    <rd:DefaultName>Textbox12</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -121,12 +121,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox30">
+                  <Textbox Name="Textbox13">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -146,7 +146,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox30</rd:DefaultName>
+                    <rd:DefaultName>Textbox13</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -160,7 +160,7 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
             </TablixCornerRow>
@@ -170,6 +170,12 @@
               <TablixCornerCell />
               <TablixCornerCell />
             </TablixCornerRow>
+            <TablixCornerRow>
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+            </TablixCornerRow>
           </TablixCornerRows>
         </TablixCorner>
         <TablixBody>
@@ -177,6 +183,9 @@
             <TablixColumn>
               <Width>0.99127cm</Width>
             </TablixColumn>
+            <TablixColumn>
+              <Width>0.9125cm</Width>
+            </TablixColumn>
             <TablixColumn>
               <Width>0.91249cm</Width>
             </TablixColumn>
@@ -227,6 +236,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox35">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>#4c68a2</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox35</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>WhiteSmoke</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt1">
@@ -349,6 +397,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox36">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox36</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>#7292cc</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt5">
@@ -432,6 +519,56 @@
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="plant">
+                <GroupExpressions>
+                  <GroupExpression>=Fields!plant.Value</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!plant.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>0.6cm</Size>
+                <CellContents>
+                  <Textbox Name="plant">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>=Fields!plant.Value</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>plant</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Color>#e0e0e0</Color>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
               <TablixMembers>
                 <TablixMember>
                   <Group Name="team">
@@ -542,15 +679,14 @@
                   <TablixHeader>
                     <Size>1.2cm</Size>
                     <CellContents>
-                  <Textbox Name="Textbox16">
+                      <Textbox Name="Textbox32">
                         <CanGrow>true</CanGrow>
                         <KeepTogether>true</KeepTogether>
                         <Paragraphs>
                           <Paragraph>
                             <TextRuns>
                               <TextRun>
-                            <Value>Sub
+                                <Value>Sub Total</Value>
-Total</Value>
                                 <Style>
                                   <FontFamily>Tahoma</FontFamily>
                                   <FontWeight>Bold</FontWeight>
@@ -562,7 +698,49 @@ Total</Value>
                             </Style>
                           </Paragraph>
                         </Paragraphs>
-                    <rd:DefaultName>Textbox16</rd:DefaultName>
+                        <rd:DefaultName>Textbox32</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Color>#e0e0e0</Color>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>1.8cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox15">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>Total</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox15</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -581,9 +759,9 @@ Total</Value>
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>1.2cm</Size>
+                <Size>1.8cm</Size>
                 <CellContents>
-                  <Textbox Name="Textbox1">
+                  <Textbox Name="Textbox17">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -602,7 +780,7 @@ Total</Value>
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox1</rd:DefaultName>
+                    <rd:DefaultName>Textbox17</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -1006,9 +1184,11 @@ Total</Value>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
+        <RepeatRowHeaders>true</RepeatRowHeaders>
+        <FixedRowHeaders>true</FixedRowHeaders>
         <DataSetName>DataSet1</DataSetName>
-        <Height>2.4cm</Height>
+        <Height>3cm</Height>
-        <Width>17.84334cm</Width>
+        <Width>18.75583cm</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1018,7 +1198,7 @@ Total</Value>
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>0.94488in</Height>
+    <Height>1.1811in</Height>
     <Style />
   </Body>
   <Width>10.80859in</Width>
@@ -1204,10 +1384,14 @@ Total</Value>
           <DataField>Remark</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="plant">
+          <DataField>plant</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>dsEQ</rd:DataSetName>
-        <rd:SchemaPath>D:\Source\GroupWare\EET_GroupWare_180713_0000\Project\dsEQ.xsd</rd:SchemaPath>
+        <rd:SchemaPath>D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FEQ0000\dsEQ.xsd</rd:SchemaPath>
         <rd:TableName>vEquStockB</rd:TableName>
         <rd:TableAdapterFillMethod>Fill</rd:TableAdapterFillMethod>
         <rd:TableAdapterGetDataMethod>GetData</rd:TableAdapterGetDataMethod>

SubProject/FEQ0000/Equipment/ReportI.rdlc

@@ -8,7 +8,7 @@
             <TablixCornerRow>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox7">
+                  <Textbox Name="Textbox6">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -28,7 +28,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox7</rd:DefaultName>
+                    <rd:DefaultName>Textbox6</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -42,12 +42,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox19">
+                  <Textbox Name="Textbox8">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -68,7 +68,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox19</rd:DefaultName>
+                    <rd:DefaultName>Textbox8</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -82,12 +82,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox4">
+                  <Textbox Name="Textbox12">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -107,7 +107,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox4</rd:DefaultName>
+                    <rd:DefaultName>Textbox12</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -121,12 +121,12 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
               <TablixCornerCell>
                 <CellContents>
-                  <Textbox Name="Textbox30">
+                  <Textbox Name="Textbox13">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -146,7 +146,7 @@
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox30</rd:DefaultName>
+                    <rd:DefaultName>Textbox13</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -160,7 +160,7 @@
                       <PaddingBottom>2pt</PaddingBottom>
                     </Style>
                   </Textbox>
-                  <RowSpan>2</RowSpan>
+                  <RowSpan>3</RowSpan>
                 </CellContents>
               </TablixCornerCell>
             </TablixCornerRow>
@@ -170,6 +170,12 @@
               <TablixCornerCell />
               <TablixCornerCell />
             </TablixCornerRow>
+            <TablixCornerRow>
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+              <TablixCornerCell />
+            </TablixCornerRow>
           </TablixCornerRows>
         </TablixCorner>
         <TablixBody>
@@ -177,6 +183,9 @@
             <TablixColumn>
               <Width>0.99127cm</Width>
             </TablixColumn>
+            <TablixColumn>
+              <Width>0.96542cm</Width>
+            </TablixColumn>
             <TablixColumn>
               <Width>0.91249cm</Width>
             </TablixColumn>
@@ -227,6 +236,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox22">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>#4c68a2</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox22</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>WhiteSmoke</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt1">
@@ -349,6 +397,45 @@
                     </Textbox>
                   </CellContents>
                 </TablixCell>
+                <TablixCell>
+                  <CellContents>
+                    <Textbox Name="Textbox24">
+                      <CanGrow>true</CanGrow>
+                      <KeepTogether>true</KeepTogether>
+                      <Paragraphs>
+                        <Paragraph>
+                          <TextRuns>
+                            <TextRun>
+                              <Value>=Sum(Fields!cnt.Value)</Value>
+                              <Style>
+                                <FontFamily>Tahoma</FontFamily>
+                                <FontSize>8pt</FontSize>
+                                <FontWeight>Bold</FontWeight>
+                                <Color>White</Color>
+                              </Style>
+                            </TextRun>
+                          </TextRuns>
+                          <Style>
+                            <TextAlign>Center</TextAlign>
+                          </Style>
+                        </Paragraph>
+                      </Paragraphs>
+                      <rd:DefaultName>Textbox24</rd:DefaultName>
+                      <Style>
+                        <Border>
+                          <Color>#e0e0e0</Color>
+                          <Style>Solid</Style>
+                        </Border>
+                        <BackgroundColor>#7292cc</BackgroundColor>
+                        <VerticalAlign>Middle</VerticalAlign>
+                        <PaddingLeft>2pt</PaddingLeft>
+                        <PaddingRight>2pt</PaddingRight>
+                        <PaddingTop>2pt</PaddingTop>
+                        <PaddingBottom>2pt</PaddingBottom>
+                      </Style>
+                    </Textbox>
+                  </CellContents>
+                </TablixCell>
                 <TablixCell>
                   <CellContents>
                     <Textbox Name="cnt5">
@@ -432,6 +519,56 @@
           </TablixRows>
         </TablixBody>
         <TablixColumnHierarchy>
+          <TablixMembers>
+            <TablixMember>
+              <Group Name="plant">
+                <GroupExpressions>
+                  <GroupExpression>=Fields!plant.Value</GroupExpression>
+                </GroupExpressions>
+              </Group>
+              <SortExpressions>
+                <SortExpression>
+                  <Value>=Fields!plant.Value</Value>
+                </SortExpression>
+              </SortExpressions>
+              <TablixHeader>
+                <Size>0.6cm</Size>
+                <CellContents>
+                  <Textbox Name="plant">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>=Fields!plant.Value</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>plant</rd:DefaultName>
+                    <Style>
+                      <Border>
+                        <Color>#e0e0e0</Color>
+                        <Style>Solid</Style>
+                      </Border>
+                      <BackgroundColor>Silver</BackgroundColor>
+                      <VerticalAlign>Middle</VerticalAlign>
+                      <PaddingLeft>2pt</PaddingLeft>
+                      <PaddingRight>2pt</PaddingRight>
+                      <PaddingTop>2pt</PaddingTop>
+                      <PaddingBottom>2pt</PaddingBottom>
+                    </Style>
+                  </Textbox>
+                </CellContents>
+              </TablixHeader>
               <TablixMembers>
                 <TablixMember>
                   <Group Name="team">
@@ -542,7 +679,7 @@
                   <TablixHeader>
                     <Size>1.2cm</Size>
                     <CellContents>
-                  <Textbox Name="Textbox16">
+                      <Textbox Name="Textbox20">
                         <CanGrow>true</CanGrow>
                         <KeepTogether>true</KeepTogether>
                         <Paragraphs>
@@ -562,7 +699,49 @@ Total</Value>
                             </Style>
                           </Paragraph>
                         </Paragraphs>
-                    <rd:DefaultName>Textbox16</rd:DefaultName>
+                        <rd:DefaultName>Textbox20</rd:DefaultName>
+                        <Style>
+                          <Border>
+                            <Color>#e0e0e0</Color>
+                            <Style>Solid</Style>
+                          </Border>
+                          <BackgroundColor>Silver</BackgroundColor>
+                          <VerticalAlign>Middle</VerticalAlign>
+                          <PaddingLeft>2pt</PaddingLeft>
+                          <PaddingRight>2pt</PaddingRight>
+                          <PaddingTop>2pt</PaddingTop>
+                          <PaddingBottom>2pt</PaddingBottom>
+                        </Style>
+                      </Textbox>
+                    </CellContents>
+                  </TablixHeader>
+                </TablixMember>
+              </TablixMembers>
+            </TablixMember>
+            <TablixMember>
+              <TablixHeader>
+                <Size>1.8cm</Size>
+                <CellContents>
+                  <Textbox Name="Textbox15">
+                    <CanGrow>true</CanGrow>
+                    <KeepTogether>true</KeepTogether>
+                    <Paragraphs>
+                      <Paragraph>
+                        <TextRuns>
+                          <TextRun>
+                            <Value>Total</Value>
+                            <Style>
+                              <FontFamily>Tahoma</FontFamily>
+                              <FontWeight>Bold</FontWeight>
+                            </Style>
+                          </TextRun>
+                        </TextRuns>
+                        <Style>
+                          <TextAlign>Center</TextAlign>
+                        </Style>
+                      </Paragraph>
+                    </Paragraphs>
+                    <rd:DefaultName>Textbox15</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -581,9 +760,9 @@ Total</Value>
             </TablixMember>
             <TablixMember>
               <TablixHeader>
-                <Size>1.2cm</Size>
+                <Size>1.8cm</Size>
                 <CellContents>
-                  <Textbox Name="Textbox1">
+                  <Textbox Name="Textbox17">
                     <CanGrow>true</CanGrow>
                     <KeepTogether>true</KeepTogether>
                     <Paragraphs>
@@ -602,7 +781,7 @@ Total</Value>
                         </Style>
                       </Paragraph>
                     </Paragraphs>
-                    <rd:DefaultName>Textbox1</rd:DefaultName>
+                    <rd:DefaultName>Textbox17</rd:DefaultName>
                     <Style>
                       <Border>
                         <Color>#e0e0e0</Color>
@@ -1006,9 +1185,11 @@ Total</Value>
             </TablixMember>
           </TablixMembers>
         </TablixRowHierarchy>
+        <RepeatRowHeaders>true</RepeatRowHeaders>
+        <FixedRowHeaders>true</FixedRowHeaders>
         <DataSetName>DataSet1</DataSetName>
-        <Height>2.4cm</Height>
+        <Height>3cm</Height>
-        <Width>17.84334cm</Width>
+        <Width>18.80875cm</Width>
         <Style>
           <Border>
             <Style>None</Style>
@@ -1018,7 +1199,7 @@ Total</Value>
         </Style>
       </Tablix>
     </ReportItems>
-    <Height>0.94488in</Height>
+    <Height>1.1811in</Height>
     <Style />
   </Body>
   <Width>10.80859in</Width>
@@ -1204,10 +1385,14 @@ Total</Value>
           <DataField>Remark</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
+        <Field Name="plant">
+          <DataField>plant</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>dsEQ</rd:DataSetName>
-        <rd:SchemaPath>D:\Source\GroupWare\EET_GroupWare_180713_0000\Project\dsEQ.xsd</rd:SchemaPath>
+        <rd:SchemaPath>D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FEQ0000\dsEQ.xsd</rd:SchemaPath>
         <rd:TableName>vEquStockB</rd:TableName>
         <rd:TableAdapterFillMethod>Fill</rd:TableAdapterFillMethod>
         <rd:TableAdapterGetDataMethod>GetData</rd:TableAdapterGetDataMethod>

SubProject/FEQ0000/Equipment/fEquipment.Designer.cs

@@ -31,6 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment));
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.bn = new System.Windows.Forms.BindingNavigator(this.components);
             this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
             this.bsB = new System.Windows.Forms.BindingSource(this.components);
@@ -50,22 +51,9 @@
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.tbFilter = new System.Windows.Forms.ToolStripTextBox();
             this.btFind = new System.Windows.Forms.ToolStripButton();
+            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.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = 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();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.label1 = new System.Windows.Forms.Label();
@@ -105,8 +93,25 @@
             this.bsME = new System.Windows.Forms.BindingSource(this.components);
             this.bsIng = new System.Windows.Forms.BindingSource(this.components);
             this.taIng = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
-            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+            this.bsOther = new System.Windows.Forms.BindingSource(this.components);
-            this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
+            this.taOther = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            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();
@@ -119,6 +124,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.bsF)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsME)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsIng)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsOther)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
@@ -288,6 +294,22 @@
             this.btFind.Text = "Find(&F)";
             this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click);
             // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            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.Text = "Tem/Part/Plant Update";
+            this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다.";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
+            // 
+            // prb1
+            // 
+            this.prb1.Name = "prb1";
+            this.prb1.Size = new System.Drawing.Size(100, 22);
+            // 
             // dv
             // 
             this.dv.AllowUserToAddRows = false;
@@ -296,8 +318,10 @@
             this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
+            this.plant,
             this.dataGridViewTextBoxColumn2,
             this.dataGridViewTextBoxColumn3,
+            this.flag,
             this.dataGridViewTextBoxColumn4,
             this.type,
             this.dataGridViewTextBoxColumn8,
@@ -319,113 +343,6 @@
             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;
-            // 
-            // 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;
-            // 
-            // 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;
-            // 
             // cm1
             // 
             this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -743,6 +660,7 @@
             // 
             this.tam.BackupDataSetBeforeUpdate = false;
             this.tam.EETGW_EquipmentIngTableAdapter = null;
+            this.tam.EETGW_EquipmentOtherTableAdapter = null;
             this.tam.EquipmentBTableAdapter = this.taB;
             this.tam.EquipmentFilterTableAdapter = null;
             this.tam.EquipmentFTableAdapter = this.taF;
@@ -768,21 +686,135 @@
             // 
             this.taIng.ClearBeforeFill = true;
             // 
-            // toolStripButton1
+            // bsOther
             // 
-            this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.bsOther.DataMember = "EETGW_EquipmentOther";
-            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.bsOther.DataSource = this.dsEQ;
-            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(118, 22);
-            this.toolStripButton1.Text = "Tem/Part Update";
-            this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다.";
-            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
             // 
-            // prb1
+            // taOther
             // 
-            this.prb1.Name = "prb1";
+            this.taOther.ClearBeforeFill = true;
-            this.prb1.Size = new System.Drawing.Size(100, 22);
+            // 
+            // 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;
+            // 
+            // plant
+            // 
+            this.plant.DataPropertyName = "plant";
+            this.plant.HeaderText = "plant";
+            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
             // 
@@ -812,6 +844,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.bsF)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsME)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsIng)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsOther)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -861,21 +894,6 @@
         private System.Windows.Forms.ToolStripTextBox tbFilter;
         private System.Windows.Forms.ToolStripButton btFind;
         private System.Windows.Forms.ToolStrip toolStrip1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn type;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lineT;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lineP;
-        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.ToolStripButton toolStripButton4;
         private System.Windows.Forms.ToolStripButton toolStripButton5;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
@@ -895,5 +913,24 @@
         private dsEQTableAdapters.EETGW_EquipmentIngTableAdapter taIng;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ToolStripProgressBar prb1;
+        private System.Windows.Forms.BindingSource bsOther;
+        private dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter taOther;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn plant;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn flag;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn type;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lineT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lineP;
+        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;
     }
 }

SubProject/FEQ0000/Equipment/fEquipment.cs

@@ -19,7 +19,8 @@ namespace FEQ0000
             MOLD,
             FOL,
             BUMP,
-            ING
+            ING,
+            OTHER
         }
         string tableName = string.Empty;
         eTabletype dataType = eTabletype.FOL;
@@ -49,6 +50,13 @@ namespace FEQ0000
                 this.dsEQ.EETGW_EquipmentIng.TableNewRow += Equipment_TableNewRow;
                 dvc_param.Visible = false;
             }
+            else if (dataType == eTabletype.OTHER)
+            {
+
+                tableName = "EETGW_EquipmentOther";
+                this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
+                dvc_param.Visible = false;
+            }
             else
             {
 
@@ -74,6 +82,7 @@ namespace FEQ0000
             if (dataType == eTabletype.BUMP) dtList = taDateList.GetDateListB();
             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 dtList = taDateList.GetDateListME();
 
             this.cmbDate.Items.Clear();
@@ -118,9 +127,9 @@ namespace FEQ0000
             if (this.cmbManu.Items.Count > 0) cmbManu.SelectedIndex = 0;
             if (this.cmbType.Items.Count > 0) cmbType.SelectedIndex = 0;
 
-            if (this.dataType == eTabletype.ING)
+            //if (this.dataType == eTabletype.ING)
-                dvc_param.HeaderText = "RCS Flag";
+            //    dvc_param.HeaderText = "RCS Flag";
-            else
+            //else
             dvc_param.HeaderText = "Wafer Size";
 
         }
@@ -132,6 +141,7 @@ namespace FEQ0000
             this.bsF.EndEdit();
             this.bsME.EndEdit();
             this.bsIng.EndEdit();
+            this.bsOther.EndEdit();
 
             try
             {
@@ -147,6 +157,10 @@ namespace FEQ0000
                 {
                     this.taIng.Update(this.dsEQ.EETGW_EquipmentIng);
                 }
+                else if(dataType == eTabletype.OTHER)
+                {
+                    this.taOther.Update(this.dsEQ.EETGW_EquipmentOther);
+                }
                 else
                 {
                     this.taF.Update(this.dsEQ.EquipmentF);
@@ -177,6 +191,7 @@ namespace FEQ0000
                 if (dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter);
                 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 dRows = this.dsEQ.EquipmentF.Select(filter);
 
                 int cnt = 0;
@@ -219,6 +234,7 @@ namespace FEQ0000
                     if (dataType == eTabletype.MOLD) this.bsME.Filter = filter;
                     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 this.bsF.Filter = filter;
 
                     if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
@@ -357,6 +373,17 @@ namespace FEQ0000
                     dv.DataSource = bsIng;
                     bn.BindingSource = bsIng;
                     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.dsEQ.EETGW_EquipmentOther.Clear();
+                    taOther.Fill(this.dsEQ.EETGW_EquipmentOther, this.cmbDate.Text);
+                    this.dsEQ.EETGW_EquipmentOther.AcceptChanges();
+                    dv.DataSource = bsOther;
+                    bn.BindingSource = bsOther;
+                    break;
             }
 
         }
@@ -480,10 +507,11 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+                        if (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.EndEdit();
                             ucnt += 1;
                         }
@@ -500,10 +528,11 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+                        if (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.EndEdit();
                             ucnt += 1;
                         }
@@ -520,10 +549,32 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+                        if (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.EndEdit();
+                            ucnt += 1;
+                        }
+                    }
+                }
+            }
+            else if (dataType == eTabletype.OTHER)
+            {
+                this.prb1.Maximum = this.dsEQ.EETGW_EquipmentOther.Count;
+                foreach (dsEQ.EETGW_EquipmentOtherRow dr in this.dsEQ.EETGW_EquipmentOther)
+                {
+                    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.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
+                        {
+                            dr.lineP = linedata.part;
+                            dr.lineT = linedata.team;
+                            dr.plant = linedata.plant;
                             dr.EndEdit();
                             ucnt += 1;
                         }
@@ -540,10 +591,11 @@ namespace FEQ0000
                     var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
                     if (linedata != null)
                     {
-                        if (dr.lineP != linedata.part || dr.lineT != linedata.team)
+                        if (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.EndEdit();
                             ucnt += 1;
                         }

SubProject/FEQ0000/Equipment/fEquipment.resx

@@ -228,6 +228,12 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="plant.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>
   <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -267,12 +273,12 @@
   <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEajz9kWk6ztXlMMpC7qxrQi7qxo
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIHVR8VEVcWfF
-        pakgUScFdaeuWtPkAaRu4rrJ0h8KY75xpjRmGoMfXLjMvecMA6OsCqXK2uiyYo7c6g56flwuAMKh7sxe
+        VpoWStRJQd2pq9Y02You484GXVqlMOZeZ0pjHkYPHLjMud8ZBoakiXOyMOgV9IFVXINZHOcTAF5fNV8e
-        9ueocKg6pSWmaa4HZOMimbbnNO5RFHqcYcbX5GGwl4WXJb6nDlZKMAhvtEHy2snBoiDBTu457M1Ed4pg
+        Nqdgr6+YuUt0XV902VI3eNye8tcWB8MMZ5CJtWQhbEfh+RLHVjqpJRB4F7QTPO3EYGkogZ3Yc/DNTDWz
-        UdiZEK2/kKCZeFq/DCyKSVKGScZu1Ygj+0sMn+736G6zzvpe16DnJw3WN606m4m9ODr8fL6qbSv+dVbw
+        YGnYGTHanpXAMLJpOw8sjSUhgyVDq6iN/a1PGd5db/D1ahnnVkPjp8cVnKtGGTO5N/YPPu7PSqvEOY8W
-        cNuiFhecHhv0rPsjsKxN+njXygrc2hZ7RkA0O3mz38Xwr8IuGAaLBERvz6KjDxmwXFJYJPC0TpEEM1zE
+        3FzWuCEKTo403mx8FxjGMr+9qkULrNIKPsNltP72XH+X4W+GXWAQlnKZuhv4h5MkYN6JsJRr072sEsjg
-        1+WBJJZIGJzO+FpxfkvQl4ZFQqIeAPwXjOCTjN1Kw0//yeLX5aIo36556oHRrqKAAAAAAElFTkSuQmCC
+        IrGerLQShMNMrGXrZ8mfYCmPKfsA/gsGwScZWoWKE/6T2a+LiZAvNU/p9XnZUIQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -282,11 +288,11 @@
         s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
         Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
         /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
-        d/+7t3/4X7/uwZ+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+        d/+7t3/4X7/u7p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
         IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
         qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
         O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
-        ABxqLxtW9DuCAAAAAElFTkSuQmCC
+        AA/RLxW0ki8TAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -304,14 +310,14 @@
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNLwNBHIdLEBGvF4lPIE6+gu8iERcnETeT
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
-        NKSqqtTaWttautUuW6u7VpVVUmm1jZe00h6EhBOhWhcRooxdmUa33ShP8rvM7/9MZjIZXSUM1EaPldnB
+        BqQwU7PU1rbVtlw1S9vcdbWtzcTwpahEI4OI8NabWZeIImvajZFaW9Ie+F3m93+GGYZRVUJDbvSZPFuY
-        rfS2y+oOmI24rxNVv2PAV9owb9AfSN2/JLMQKkk8fkL+9DIrb0QCAGrQaDlyWW1jpeDZQ/5bLE3oKvcx
+        idp0mty8QYv5u1H1NxrM1WHxhUP86e1zpgChlPT9B2SOLwriRgQAoA6N/kYsa61eIZy6K36J5Ymc599n
-        7d7G0Xg5Uy6h/+j68V1LLkQ8vc7oSU8XUtSQfJjTkoqTyHxAy4p/EilqlgLxAy2pNPh6kEKKGodwJGoJ
+        3JsYGv/NtJMdTORu35TkUrjjXF5NrPQgRQ7BxGgl6WfS+XdodIX0SJGzxB9ElKTyYOthEily7GyCUxJ+
-        xUnIsTK7GFLUmJ1+/fHtq6ZYiJS+eTbY2B6kqBmYoZtJr5TTEpUorzPHSBwaVwMAVW+iuK3F3Wje5jt8
+        Ji3G5Nm2IEWOwRFSH169KIqlCNnLJ43V24cUOUOzVCvhEx6URCnS68x5BBqNywGAbNSRdJDYThat/r3H
-        Orl7U8mRi0x+bnVvb3icaEHKDwDDGs3LfIiR4p8TdpbtI4iGWU9gxC5GthxCODrPhzizy9+rg7AKKT8A
+        o+tXmRw/uynOre7sjE7ibUj5BlgszYZlJuriEx9TNq93AMebzCv8mI2LB+1sLDnPRGmDM9SvgrAGKd8A
-        C9VqcQr7fDgJTYveTVmuRVVlBnFn+wwtxITIOZykOAmAtTpUVWZ0iu6YpTfPxGgKysc/GDLam1D1N4yk
+        I9ludLC7TCwDdYu+gCjXo6oyw5ijc5Zi99n4CdSTtADAWgOqKjM+TXWZqUCKS55C8fiREa2tBVXVoSV8
-        d0GMpaFyAuUDoeW/o7c5u8cIhlCugZb+gU73Bafvl6JCGIXLAAAAAElFTkSuQmCC
+        C9x+FkonkD4QWq4etdXRO4F7cOkaaOkfqFSfYfuXgmGBwFoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -363,4 +369,10 @@
   <metadata name="taIng.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>231, 56</value>
   </metadata>
+  <metadata name="bsOther.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>311, 56</value>
+  </metadata>
+  <metadata name="taOther.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>407, 56</value>
+  </metadata>
 </root>

SubProject/FEQ0000/Equipment/fEquipmentSummary.Designer.cs

@@ -0,0 +1,495 @@
+namespace FEQ0000
+{
+    partial class fEquipmentSummary
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipmentSummary));
+            this.bn = new System.Windows.Forms.BindingNavigator(this.components);
+            this.bsB = new System.Windows.Forms.BindingSource(this.components);
+            this.dsEQ = new FEQ0000.dsEQ();
+            this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
+            this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
+            this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+            this.tbFilter = new System.Windows.Forms.ToolStripTextBox();
+            this.btFind = new System.Windows.Forms.ToolStripButton();
+            this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
+            this.dv = new System.Windows.Forms.DataGridView();
+            this.srcDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.manuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.modelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.linecodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.linePDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cntDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.plantDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
+            this.cmbDateF = new System.Windows.Forms.ToolStripComboBox();
+            this.ta = new FEQ0000.dsEQTableAdapters.vEquStockSummaryTableAdapter();
+            this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
+            this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
+            this.cmbDateM = new System.Windows.Forms.ToolStripComboBox();
+            this.cmbDateO = new System.Windows.Forms.ToolStripComboBox();
+            this.cmbDateB = new System.Windows.Forms.ToolStripComboBox();
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
+            this.bn.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
+            this.cm1.SuspendLayout();
+            this.toolStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // bn
+            // 
+            this.bn.AddNewItem = null;
+            this.bn.BindingSource = this.bsB;
+            this.bn.CountItem = this.bindingNavigatorCountItem;
+            this.bn.DeleteItem = null;
+            this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.bindingNavigatorMoveFirstItem,
+            this.bindingNavigatorMovePreviousItem,
+            this.bindingNavigatorSeparator,
+            this.bindingNavigatorPositionItem,
+            this.bindingNavigatorCountItem,
+            this.bindingNavigatorSeparator1,
+            this.bindingNavigatorMoveNextItem,
+            this.bindingNavigatorMoveLastItem,
+            this.bindingNavigatorSeparator2,
+            this.toolStripLabel1,
+            this.tbFilter,
+            this.btFind,
+            this.prb1});
+            this.bn.Location = new System.Drawing.Point(0, 596);
+            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(1105, 25);
+            this.bn.TabIndex = 0;
+            this.bn.Text = "bindingNavigator1";
+            // 
+            // bsB
+            // 
+            this.bsB.DataMember = "vEquStockSummary";
+            this.bsB.DataSource = this.dsEQ;
+            // 
+            // dsEQ
+            // 
+            this.dsEQ.DataSetName = "dsEQ";
+            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // bindingNavigatorCountItem
+            // 
+            this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22);
+            this.bindingNavigatorCountItem.Text = "/{0}";
+            this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
+            // 
+            // bindingNavigatorMoveFirstItem
+            // 
+            this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
+            this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
+            this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동";
+            // 
+            // bindingNavigatorMovePreviousItem
+            // 
+            this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
+            this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
+            this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동";
+            // 
+            // bindingNavigatorSeparator
+            // 
+            this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorPositionItem
+            // 
+            this.bindingNavigatorPositionItem.AccessibleName = "위치";
+            this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
+            this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
+            this.bindingNavigatorPositionItem.Text = "0";
+            this.bindingNavigatorPositionItem.ToolTipText = "현재 위치";
+            // 
+            // bindingNavigatorSeparator1
+            // 
+            this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorMoveNextItem
+            // 
+            this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
+            this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
+            this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveNextItem.Text = "다음으로 이동";
+            // 
+            // bindingNavigatorMoveLastItem
+            // 
+            this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
+            this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
+            this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동";
+            // 
+            // bindingNavigatorSeparator2
+            // 
+            this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
+            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // toolStripLabel1
+            // 
+            this.toolStripLabel1.Name = "toolStripLabel1";
+            this.toolStripLabel1.Size = new System.Drawing.Size(33, 22);
+            this.toolStripLabel1.Text = "Filter";
+            // 
+            // tbFilter
+            // 
+            this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbFilter.Font = new System.Drawing.Font("맑은 고딕", 9F);
+            this.tbFilter.Name = "tbFilter";
+            this.tbFilter.Size = new System.Drawing.Size(150, 25);
+            this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown);
+            // 
+            // btFind
+            // 
+            this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image")));
+            this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btFind.Name = "btFind";
+            this.btFind.Size = new System.Drawing.Size(64, 22);
+            this.btFind.Text = "Find(&F)";
+            this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click);
+            // 
+            // prb1
+            // 
+            this.prb1.Name = "prb1";
+            this.prb1.Size = new System.Drawing.Size(100, 22);
+            // 
+            // dv
+            // 
+            this.dv.AllowUserToAddRows = false;
+            this.dv.AutoGenerateColumns = false;
+            this.dv.ColumnHeadersHeight = 30;
+            this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.srcDataGridViewTextBoxColumn,
+            this.pdateDataGridViewTextBoxColumn,
+            this.grpDataGridViewTextBoxColumn,
+            this.manuDataGridViewTextBoxColumn,
+            this.modelDataGridViewTextBoxColumn,
+            this.linecodeDataGridViewTextBoxColumn,
+            this.lineTDataGridViewTextBoxColumn,
+            this.linePDataGridViewTextBoxColumn,
+            this.cntDataGridViewTextBoxColumn,
+            this.remarkDataGridViewTextBoxColumn,
+            this.plantDataGridViewTextBoxColumn});
+            this.dv.ContextMenuStrip = this.cm1;
+            this.dv.DataSource = this.bsB;
+            this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dv.Location = new System.Drawing.Point(0, 30);
+            this.dv.Name = "dv";
+            this.dv.RowTemplate.Height = 23;
+            this.dv.Size = new System.Drawing.Size(1105, 566);
+            this.dv.TabIndex = 1;
+            // 
+            // srcDataGridViewTextBoxColumn
+            // 
+            this.srcDataGridViewTextBoxColumn.DataPropertyName = "Src";
+            this.srcDataGridViewTextBoxColumn.HeaderText = "Src";
+            this.srcDataGridViewTextBoxColumn.Name = "srcDataGridViewTextBoxColumn";
+            // 
+            // pdateDataGridViewTextBoxColumn
+            // 
+            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
+            this.pdateDataGridViewTextBoxColumn.HeaderText = "pdate";
+            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
+            // 
+            // grpDataGridViewTextBoxColumn
+            // 
+            this.grpDataGridViewTextBoxColumn.DataPropertyName = "grp";
+            this.grpDataGridViewTextBoxColumn.HeaderText = "grp";
+            this.grpDataGridViewTextBoxColumn.Name = "grpDataGridViewTextBoxColumn";
+            // 
+            // manuDataGridViewTextBoxColumn
+            // 
+            this.manuDataGridViewTextBoxColumn.DataPropertyName = "manu";
+            this.manuDataGridViewTextBoxColumn.HeaderText = "manu";
+            this.manuDataGridViewTextBoxColumn.Name = "manuDataGridViewTextBoxColumn";
+            // 
+            // modelDataGridViewTextBoxColumn
+            // 
+            this.modelDataGridViewTextBoxColumn.DataPropertyName = "model";
+            this.modelDataGridViewTextBoxColumn.HeaderText = "model";
+            this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn";
+            // 
+            // linecodeDataGridViewTextBoxColumn
+            // 
+            this.linecodeDataGridViewTextBoxColumn.DataPropertyName = "linecode";
+            this.linecodeDataGridViewTextBoxColumn.HeaderText = "linecode";
+            this.linecodeDataGridViewTextBoxColumn.Name = "linecodeDataGridViewTextBoxColumn";
+            // 
+            // lineTDataGridViewTextBoxColumn
+            // 
+            this.lineTDataGridViewTextBoxColumn.DataPropertyName = "lineT";
+            this.lineTDataGridViewTextBoxColumn.HeaderText = "lineT";
+            this.lineTDataGridViewTextBoxColumn.Name = "lineTDataGridViewTextBoxColumn";
+            // 
+            // linePDataGridViewTextBoxColumn
+            // 
+            this.linePDataGridViewTextBoxColumn.DataPropertyName = "lineP";
+            this.linePDataGridViewTextBoxColumn.HeaderText = "lineP";
+            this.linePDataGridViewTextBoxColumn.Name = "linePDataGridViewTextBoxColumn";
+            // 
+            // cntDataGridViewTextBoxColumn
+            // 
+            this.cntDataGridViewTextBoxColumn.DataPropertyName = "cnt";
+            this.cntDataGridViewTextBoxColumn.HeaderText = "cnt";
+            this.cntDataGridViewTextBoxColumn.Name = "cntDataGridViewTextBoxColumn";
+            // 
+            // remarkDataGridViewTextBoxColumn
+            // 
+            this.remarkDataGridViewTextBoxColumn.DataPropertyName = "Remark";
+            this.remarkDataGridViewTextBoxColumn.HeaderText = "Remark";
+            this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
+            // 
+            // plantDataGridViewTextBoxColumn
+            // 
+            this.plantDataGridViewTextBoxColumn.DataPropertyName = "plant";
+            this.plantDataGridViewTextBoxColumn.HeaderText = "plant";
+            this.plantDataGridViewTextBoxColumn.Name = "plantDataGridViewTextBoxColumn";
+            // 
+            // cm1
+            // 
+            this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.autosizeColumnsToolStripMenuItem});
+            this.cm1.Name = "cm1";
+            this.cm1.Size = new System.Drawing.Size(173, 26);
+            // 
+            // autosizeColumnsToolStripMenuItem
+            // 
+            this.autosizeColumnsToolStripMenuItem.Name = "autosizeColumnsToolStripMenuItem";
+            this.autosizeColumnsToolStripMenuItem.Size = new System.Drawing.Size(172, 22);
+            this.autosizeColumnsToolStripMenuItem.Text = "Autosize Columns";
+            this.autosizeColumnsToolStripMenuItem.Click += new System.EventHandler(this.autosizeColumnsToolStripMenuItem_Click);
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.AutoSize = false;
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripLabel3,
+            this.toolStripButton4,
+            this.toolStripButton6,
+            this.cmbDateF,
+            this.toolStripLabel4,
+            this.cmbDateM,
+            this.toolStripLabel5,
+            this.cmbDateB,
+            this.toolStripLabel6,
+            this.cmbDateO});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(1105, 30);
+            this.toolStrip1.TabIndex = 3;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // toolStripButton4
+            // 
+            this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
+            this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton4.Name = "toolStripButton4";
+            this.toolStripButton4.Size = new System.Drawing.Size(62, 27);
+            this.toolStripButton4.Text = "Report";
+            this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
+            // 
+            // toolStripButton6
+            // 
+            this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
+            this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton6.Name = "toolStripButton6";
+            this.toolStripButton6.Size = new System.Drawing.Size(82, 27);
+            this.toolStripButton6.Text = "Data View";
+            this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
+            // 
+            // cmbDateF
+            // 
+            this.cmbDateF.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDateF.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
+            this.cmbDateF.Name = "cmbDateF";
+            this.cmbDateF.Size = new System.Drawing.Size(121, 30);
+            // 
+            // ta
+            // 
+            this.ta.ClearBeforeFill = true;
+            // 
+            // toolStripLabel3
+            // 
+            this.toolStripLabel3.Name = "toolStripLabel3";
+            this.toolStripLabel3.Size = new System.Drawing.Size(61, 27);
+            this.toolStripLabel3.Text = "Date(FOL)";
+            // 
+            // toolStripLabel4
+            // 
+            this.toolStripLabel4.Name = "toolStripLabel4";
+            this.toolStripLabel4.Size = new System.Drawing.Size(101, 27);
+            this.toolStripLabel4.Text = "Date(MOLD-EOL)";
+            // 
+            // toolStripLabel5
+            // 
+            this.toolStripLabel5.Name = "toolStripLabel5";
+            this.toolStripLabel5.Size = new System.Drawing.Size(73, 27);
+            this.toolStripLabel5.Text = "Date(BUMP)";
+            // 
+            // toolStripLabel6
+            // 
+            this.toolStripLabel6.Name = "toolStripLabel6";
+            this.toolStripLabel6.Size = new System.Drawing.Size(73, 27);
+            this.toolStripLabel6.Text = "Date(K3/K5)";
+            // 
+            // cmbDateME
+            // 
+            this.cmbDateM.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDateM.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
+            this.cmbDateM.Name = "cmbDateME";
+            this.cmbDateM.Size = new System.Drawing.Size(121, 30);
+            // 
+            // cmbDateOther
+            // 
+            this.cmbDateO.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDateO.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
+            this.cmbDateO.Name = "cmbDateOther";
+            this.cmbDateO.Size = new System.Drawing.Size(121, 30);
+            // 
+            // cmbDateB
+            // 
+            this.cmbDateB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbDateB.FlatStyle = System.Windows.Forms.FlatStyle.Standard;
+            this.cmbDateB.Name = "cmbDateB";
+            this.cmbDateB.Size = new System.Drawing.Size(121, 30);
+            // 
+            // fEquipmentSummary
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1105, 621);
+            this.Controls.Add(this.dv);
+            this.Controls.Add(this.bn);
+            this.Controls.Add(this.toolStrip1);
+            this.Name = "fEquipmentSummary";
+            this.Text = "fEquipment";
+            this.Load += new System.EventHandler(this.@__Load);
+            ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
+            this.bn.ResumeLayout(false);
+            this.bn.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bsB)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
+            this.cm1.ResumeLayout(false);
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.BindingSource bsB;
+        private System.Windows.Forms.BindingNavigator bn;
+        private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
+        private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
+        private System.Windows.Forms.DataGridView dv;
+        private dsEQ dsEQ;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+        private System.Windows.Forms.ToolStripTextBox tbFilter;
+        private System.Windows.Forms.ToolStripButton btFind;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton toolStripButton4;
+        private System.Windows.Forms.ToolStripButton toolStripButton6;
+        private System.Windows.Forms.ToolStripComboBox cmbDateF;
+        private System.Windows.Forms.ContextMenuStrip cm1;
+        private System.Windows.Forms.ToolStripMenuItem autosizeColumnsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripProgressBar prb1;
+        private dsEQTableAdapters.vEquStockSummaryTableAdapter ta;
+        private System.Windows.Forms.DataGridViewTextBoxColumn srcDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn grpDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn manuDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn modelDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn linecodeDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lineTDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn linePDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cntDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn plantDataGridViewTextBoxColumn;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel3;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel6;
+        private System.Windows.Forms.ToolStripComboBox cmbDateB;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel5;
+        private System.Windows.Forms.ToolStripComboBox cmbDateM;
+        private System.Windows.Forms.ToolStripLabel toolStripLabel4;
+        private System.Windows.Forms.ToolStripComboBox cmbDateO;
+    }
+}

SubProject/FEQ0000/Equipment/fEquipmentSummary.cs

@@ -0,0 +1,165 @@
+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;
+using System.CodeDom.Compiler;
+using System.Reflection;
+using Microsoft.CSharp;
+
+namespace FEQ0000
+{
+    public partial class fEquipmentSummary : Form
+    {
+
+
+
+        public fEquipmentSummary()
+        {
+            InitializeComponent();
+
+
+            this.FormClosed += fEquipment_FormClosed;
+        }
+
+        void fEquipment_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            var form = this as Form;
+            // FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, false);
+        }
+
+        void RefreshDate()
+        {
+            //등록된 날짜 목록을 가져온다.
+            var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
+            
+            DataTable dtListF = taDateList.GetDateListF();
+            DataTable dtListB = taDateList.GetDateListB();
+            DataTable dtListM = taDateList.GetDateListME();
+            DataTable dtListO = taDateList.GetDateListOther();
+
+            this.cmbDateF.Items.Clear();
+            this.cmbDateB.Items.Clear();
+            this.cmbDateM.Items.Clear();
+            this.cmbDateO.Items.Clear();
+
+            if (dtListF != null)
+                foreach (DataRow dr in dtListF.Rows)
+                    this.cmbDateF.Items.Add(dr["pdate"].ToString());
+
+            if (dtListB != null)
+                foreach (DataRow dr in dtListB.Rows)
+                    this.cmbDateB.Items.Add(dr["pdate"].ToString());
+
+            if (dtListM != null)
+                foreach (DataRow dr in dtListM.Rows)
+                    this.cmbDateM.Items.Add(dr["pdate"].ToString());
+
+            if (dtListO != null)
+                foreach (DataRow dr in dtListO.Rows)
+                    this.cmbDateO.Items.Add(dr["pdate"].ToString());
+
+            if (this.cmbDateF.Items.Count > 0) this.cmbDateF.SelectedIndex = 0;
+            if (this.cmbDateB.Items.Count > 0) this.cmbDateB.SelectedIndex = 0;
+            if (this.cmbDateM.Items.Count > 0) this.cmbDateM.SelectedIndex = 0;
+            if (this.cmbDateO.Items.Count > 0) this.cmbDateO.SelectedIndex = 0;
+        }
+
+        private void __Load(object sender, EventArgs e)
+        {
+            this.Text = string.Format("Equipment Summary");
+            var form = this as Form;
+            //FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, true);
+            this.Show();
+            Application.DoEvents();
+
+            RefreshDate();
+
+            //목록을 가져온다.
+
+
+        }
+
+
+
+
+        private void toolStripButton1_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string key = tbFilter.Text.Trim();
+                string filter = "";
+                if (!key.isEmpty())
+                {
+                    filter = "asset like @ or type like @ or manu like @ or model like @ or linecode like @  or serial like @";
+                    filter = filter.Replace("@", "'%" + key.Replace("'", "''") + "%'");
+                }
+                try
+                {
+                    this.bsB.Filter = filter;
+
+                    if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
+                    else this.tbFilter.BackColor = Color.Lime;
+                }
+                catch (Exception ex)
+                {
+                    tbFilter.BackColor = Color.HotPink;
+                    FCOMMON.Util.MsgE("filter error\n" + ex.Message);
+                }
+                tbFilter.Focus();
+                tbFilter.SelectAll();
+            }
+            catch (Exception ex)
+            {
+                FCOMMON.Util.MsgE(ex.Message);
+            }
+
+        }
+
+
+        private void toolStripButton4_Click(object sender, EventArgs e)
+        {
+            var f = new rpt_equipmentSum(
+                cmbDateF.Text,
+                cmbDateB.Text,
+                cmbDateM.Text,
+                cmbDateO.Text);
+            f.Show();
+        }
+
+
+
+        private void toolStripButton6_Click(object sender, EventArgs e)
+        {
+            if (cmbDateF.SelectedIndex < 0)
+            {
+                FCOMMON.Util.MsgE("No Date");
+                return;
+            }
+
+
+            this.ta.Fill(this.dsEQ.vEquStockSummary,
+                cmbDateB.Text, 
+                cmbDateF.Text, 
+                cmbDateM.Text,
+                cmbDateO.Text);
+        }
+
+
+        private void autosizeColumnsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            this.dv.AutoResizeColumns();
+        }
+
+
+        private void tbFilter_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter) btFind.PerformClick();
+        }
+
+    }
+}
+

SubProject/FEQ0000/Equipment/fEquipmentSummary.resx

@@ -0,0 +1,219 @@
+<?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="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>81, 17</value>
+  </metadata>
+  <metadata name="bsB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>147, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        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="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        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="btFind.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="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>333, 17</value>
+  </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>227, 17</value>
+  </metadata>
+  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYyAVxC0olI6fXWEcO7tMEypEGkhaVi9VtqHj
+        UdOWSaegQoRB7NwSl9Ap9Tzx8+s54uaU5kfNLfbMWta4HiqNG4A0AZ1aHT+rzCJ+dmla7NyygqQ5pbwg
+        Ofv6ehawImSQNrOeK25OWUnc7LJEkCaQZpAhUGn8IG5GiTLQeTUgG8A2A50NlUIB8TMrNRq3TThdvq5z
+        NVSIgSFmTmkA0LYoKBcvAMXAikvr/3fumHYYKsTAkDi3QgnKxAAVazuPgjCUi90AGAA5D6QAFBZQIYaJ
+        ++c8BOGSte259VsmLMleVl+A0wCQ32adWPIfZAhUCG4ASPOuB3v/FyxvnotiAMg2kAaQ7SBBkGTmovoZ
+        IE2la9uWEjQApBlkK8h2mAHZSxvmghSDNBFlAExgiBoQO7NcrmZT76rSdZ3dIAxiZy6tSwRpAEUdKCBB
+        GBaNWcvqk2DqGRgYGADjf2uwh5UJoAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNLwNBHIdLEBGvF4lPIE6+gu8iERcnETeT
+        NKSqrdKXrbWtZbeqtFZ3u62yqil9IV5S0rqQOHmtchEhytiVkdp2o/Ukv8v8/s9kJpNRlUNDrvWY3BuY
+        iV53mlwhgxbzdaLqbzTYYpvFGw6G0ncvJzkIpaQePiF7dJ4TNyIAADVotBSxrLZ5hPDxff5bLE7k7PZj
+        yrWOofFSJp1cf+Ly+l1J/gl/dJlVE0tdSJFDsDFGSfqdVPYDGheDeqTImQ/tR5Sk4mCrYRIpchxcglcS
+        ficlxuTetCBFjoEKqg+uXxXFnwiZi2eNzdODFDkD03Qz4RUelUQp0utY3QKDxuUAQNbrSCYws5nM23w7
+        T4c3bzI5nr7KW5e3tobH8RakFAAWS6NhgY1Sgd3PCbvH04fjDeal0IidjwccXCw5w0YZgzPYq4KwCikF
+        gJFsNVLcNhs7gbo5r1+Ua1FVnkGMap+muT0ufgr1JCMAsFKHqvKMTtIdZtp/zCfTUDx+ZEhrb0JVZWgJ
+        7yy/l4HSCaQPhJYrR22jusdwNy5dAy39A5XqCyhql2fNq7MQAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>408, 17</value>
+  </metadata>
+</root>

SubProject/FEQ0000/Equipment/fImpEquipment.cs

@@ -34,6 +34,9 @@ namespace FEQ0000
                 case fEquipment.eTabletype.ING:
                     dt = new dsEQ.EETGW_EquipmentIngDataTable();
                     break;
+                case fEquipment.eTabletype.OTHER:
+                    dt = new dsEQ.EETGW_EquipmentOtherDataTable();
+                    break;
 
             }
         }
@@ -289,6 +292,10 @@ namespace FEQ0000
                         var taI = new dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
                         taI.DeleteData(dateStr);
                         break;
+                    case fEquipment.eTabletype.OTHER:
+                        var taO = new dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
+                        taO.DeleteData(dateStr);
+                        break;
                 }
             }
 
@@ -355,8 +362,9 @@ namespace FEQ0000
                 newdr["wdate"] = DateTime.Now;
                 newdr["except"] = false;
                 newdr["memo"] = string.Empty;
+                newdr["flag"] = rcsflag;  //rcs flag  210325
+
                 if (imptype == fEquipment.eTabletype.BUMP) newdr["param1"] = "8\"";
-                else if (imptype == fEquipment.eTabletype.ING) newdr["param1"] = dr[1].ToString();  //rcs flag
                 else newdr["param1"] = string.Empty;
                 dt.Rows.Add(newdr);
             }
@@ -386,6 +394,11 @@ namespace FEQ0000
                     //taI.DeleteData(dateStr);
                     taI.Update((dsEQ.EETGW_EquipmentIngDataTable)dt);
                     break;
+                case fEquipment.eTabletype.OTHER:
+                    var taO = new dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
+                    //taI.DeleteData(dateStr);
+                    taO.Update((dsEQ.EETGW_EquipmentOtherDataTable)dt);
+                    break;
             }
             dt.AcceptChanges();
             FCOMMON.Util.MsgI("Save OK");

SubProject/FEQ0000/Equipment/rpt_equipmentB.Designer.cs

@@ -29,20 +29,17 @@
         private void InitializeComponent()
         {
             Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
-            this.dsEQ = new FEQ0000.dsEQ();
             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();
             // 
-            // dsEQ
-            // 
-            this.dsEQ.DataSetName = "dsEQ";
-            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // rpv1
             // 
             this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -55,6 +52,11 @@
             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;
@@ -71,6 +73,14 @@
             // 
             this.taI.ClearBeforeFill = true;
             // 
+            // taO
+            // 
+            this.taO.ClearBeforeFill = true;
+            // 
+            // taSum
+            // 
+            this.taSum.ClearBeforeFill = true;
+            // 
             // rpt_equipmentB
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -93,5 +103,7 @@
         private dsEQTableAdapters.vEquStockFTableAdapter taF;
         private dsEQTableAdapters.vEquStockMETableAdapter taE;
         private dsEQTableAdapters.vEquStockIngTableAdapter taI;
+        private dsEQTableAdapters.vEquStockOtherTableAdapter taO;
+        private dsEQTableAdapters.vEquStockSummaryTableAdapter taSum;
     }
 }

SubProject/FEQ0000/Equipment/rpt_equipmentB.cs

@@ -56,6 +56,12 @@ namespace FEQ0000
                     taI.Fill(this.dsEQ.vEquStockIng, this.pdate);
                     DsEQ.Value = this.dsEQ.vEquStockIng;
                     break;
+                case fEquipment.eTabletype.OTHER:
+                    this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportO.rdlc";
+                    taO.Fill(this.dsEQ.vEquStockOther, this.pdate);
+                    DsEQ.Value = this.dsEQ.vEquStockOther;
+                    break;
+               
             }
 
             this.rpv1.LocalReport.DataSources.Add(DsEQ);

SubProject/FEQ0000/Equipment/rpt_equipmentB.resx

@@ -132,4 +132,10 @@
   <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_equipmentSum.Designer.cs

@@ -1,6 +1,6 @@
 namespace FEQ0000
 {
-    partial class rpt_equipmentIng
+    partial class rpt_equipmentSum
     {
         /// <summary>
         /// Required designer variable.
@@ -28,25 +28,23 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
-            this.dsEQ = new FEQ0000.dsEQ();
             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();
             // 
-            // dsEQ
-            // 
-            this.dsEQ.DataSetName = "dsEQ";
-            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // 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);
@@ -54,6 +52,11 @@
             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;
@@ -66,6 +69,18 @@
             // 
             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);
@@ -87,5 +102,8 @@
         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_equipmentSum.cs

@@ -9,20 +9,27 @@ using System.Windows.Forms;
 
 namespace FEQ0000
 {
-    public partial class rpt_equipmentIng : Form
+    public partial class rpt_equipmentSum : Form
     {
+        string pdateB = string.Empty;
+        string pdateF = string.Empty;
+        string pdateM = string.Empty;
+        string pdateO = string.Empty;
 
-        string pdate = string.Empty;
+
-        public rpt_equipmentIng(string dateStr)
+        public rpt_equipmentSum(string datestrF,string datestrB, string datestrME, string dateOther)
         {
             //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
             InitializeComponent();
-            pdate = dateStr;
+            pdateB = datestrB;
+            pdateF = datestrF;
+            pdateM = datestrME;
+            pdateO = dateOther;
         }
 
         private void rpt_equipment_Load(object sender, EventArgs e)
         {
-            this.Text = string.Format("Data Report({0})","잉여장비");
+            this.Text = string.Format("Report summary");
             this.Show();
             Application.DoEvents();
 
@@ -33,9 +40,9 @@ namespace FEQ0000
             Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();
             DsEQ.Name = "DataSet1";
 
-            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc";
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportO.rdlc";
-            taF.Fill(this.dsEQ.vEquStockF, this.pdate);
+            taSum.Fill(this.dsEQ.vEquStockSummary, pdateB,pdateF,pdateM,pdateO);
-            DsEQ.Value = this.dsEQ.vEquStockF;
+            DsEQ.Value = this.dsEQ.vEquStockSummary;
 
             this.rpv1.LocalReport.DataSources.Add(DsEQ);
             this.rpv1.RefreshReport();

SubProject/FEQ0000/Equipment/rpt_equipmentSum.resx

@@ -129,4 +129,13 @@
   <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/FEQ0000.csproj

@@ -156,6 +156,12 @@
     <Compile Include="Equipment\EQfilterManager.Designer.cs">
       <DependentUpon>EQfilterManager.cs</DependentUpon>
     </Compile>
+    <Compile Include="Equipment\fEquipmentSummary.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Equipment\fEquipmentSummary.Designer.cs">
+      <DependentUpon>fEquipmentSummary.cs</DependentUpon>
+    </Compile>
     <Compile Include="Equipment\fEquipment.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -168,11 +174,11 @@
     <Compile Include="Equipment\fImpEquipment.Designer.cs">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </Compile>
-    <Compile Include="Equipment\rpt_equipmentIng.cs">
+    <Compile Include="Equipment\rpt_equipmentSum.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Equipment\rpt_equipmentIng.Designer.cs">
+    <Compile Include="Equipment\rpt_equipmentSum.Designer.cs">
-      <DependentUpon>rpt_equipmentIng.cs</DependentUpon>
+      <DependentUpon>rpt_equipmentSum.cs</DependentUpon>
     </Compile>
     <Compile Include="MethodExtentions.cs" />
     <Compile Include="Program.cs" />
@@ -256,15 +262,19 @@
     <EmbeddedResource Include="Equipment\EQfilterManager.resx">
       <DependentUpon>EQfilterManager.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Equipment\fEquipmentSummary.resx">
+      <DependentUpon>fEquipmentSummary.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Equipment\fEquipment.resx">
       <DependentUpon>fEquipment.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Equipment\fImpEquipment.resx">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Equipment\ReportO.rdlc" />
     <EmbeddedResource Include="Equipment\ReportI.rdlc" />
-    <EmbeddedResource Include="Equipment\rpt_equipmentIng.resx">
+    <EmbeddedResource Include="Equipment\rpt_equipmentSum.resx">
-      <DependentUpon>rpt_equipmentIng.cs</DependentUpon>
+      <DependentUpon>rpt_equipmentSum.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">

SubProject/FEQ0000/dsEQ.xss

@@ -4,19 +4,22 @@
      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="1156" ViewPortY="26" 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="825" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:EqDateList" ZOrder="11" X="70" Y="70" Height="173" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <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:EquipmentF" ZOrder="10" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <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:EquipmentB" ZOrder="9" X="632" Y="70" Height="324" Width="216" 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:EquipmentME" ZOrder="8" X="918" Y="70" Height="324" Width="227" 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:vEquStockB" ZOrder="7" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <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:vEquStockF" ZOrder="6" X="1498" Y="70" Height="248" Width="212" 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:vEquStockME" ZOrder="5" X="1780" Y="70" Height="248" Width="224" 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:EquipmentFilter" ZOrder="4" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <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:LineCode" ZOrder="3" X="1623" Y="364" Height="229" Width="199" 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:EETGW_EquipmentIng" ZOrder="2" X="476" Y="456" Height="324" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <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:vEquStockIng" ZOrder="1" X="1865" Y="364" Height="248" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <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: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:vEquStockOther" ZOrder="2" 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" />
   </Shapes>
   <Connectors />
 </DiagramLayout>