diff --git a/JobReportMailService/Properties/AssemblyInfo.cs b/JobReportMailService/Properties/AssemblyInfo.cs index d743fe7..ba65e0b 100644 --- a/JobReportMailService/Properties/AssemblyInfo.cs +++ b/JobReportMailService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.03.08.1750")] -[assembly: AssemblyFileVersion("21.03.08.1750")] +[assembly: AssemblyVersion("21.03.25.1300")] +[assembly: AssemblyFileVersion("21.03.25.1300")] diff --git a/JobReportMailService/fScheduleDay.cs b/JobReportMailService/fScheduleDay.cs index 1692b12..245fe75 100644 --- a/JobReportMailService/fScheduleDay.cs +++ b/JobReportMailService/fScheduleDay.cs @@ -145,10 +145,10 @@ namespace JobReportMailService body.AppendLine(""); body.AppendLine(""); body.AppendLine(""); - body.AppendLine(""); + body.AppendLine(""); body.AppendLine(""); body.AppendLine(""); - body.AppendLine(""); + body.AppendLine(""); body.AppendLine(""); var ll = row.OrderBy(t => t.seq).ToList(); foreach (var srow in ll) @@ -161,6 +161,7 @@ namespace JobReportMailService body.AppendLine($""); body.AppendLine($""); body.AppendLine($""); + body.AppendLine($""); body.AppendLine($""); } body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료%시작완료시작완료% 
{srow.swa}{srow.ewa}{srow.progress}{srow.memo}
"); diff --git a/JobReportMailService/fScheduleDayWeek.cs b/JobReportMailService/fScheduleDayWeek.cs index 34568c0..12834f2 100644 --- a/JobReportMailService/fScheduleDayWeek.cs +++ b/JobReportMailService/fScheduleDayWeek.cs @@ -142,10 +142,10 @@ namespace JobReportMailService body.AppendLine(""); body.AppendLine(""); body.AppendLine(""); - body.AppendLine(""); + body.AppendLine(""); body.AppendLine(""); body.AppendLine(""); - body.AppendLine(""); + body.AppendLine(""); body.AppendLine(""); var ll = row.OrderBy(t => t.seq).ToList(); foreach (var srow in ll) @@ -158,6 +158,7 @@ namespace JobReportMailService body.AppendLine($""); body.AppendLine($""); body.AppendLine($""); + body.AppendLine($""); body.AppendLine($""); } body.AppendLine("
NoTitlePlan(ww)Actual(ww)진행NoTitlePlan(ww)Actual(ww)진행비고
시작완료시작완료%시작완료시작완료% 
{srow.swa}{srow.ewa}{srow.progress}{srow.memo}
"); diff --git a/Project/_Management/fLineCode.Designer.cs b/Project/_Management/fLineCode.Designer.cs index ce855b1..edfc2d1 100644 --- a/Project/_Management/fLineCode.Designer.cs +++ b/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; } diff --git a/Project/_Management/fLineCode.resx b/Project/_Management/fLineCode.resx index 8ad6710..5c2b494 100644 --- a/Project/_Management/fLineCode.resx +++ b/Project/_Management/fLineCode.resx @@ -198,6 +198,9 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + True + True diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index bebdbf6..cae3adb 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/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; + } } /// @@ -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]" + - ") VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate);\r\nSELECT idx, code" + - ", team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = SCOPE_IDENT" + - "ITY())"; + this._adapter.InsertCommand.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, plant FROM LineCode WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@team", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "team", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -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)); -SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = @idx)"; + 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, 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 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 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 except, string memo, string wuid, System.DateTime wdate) { + public virtual int Insert(string code, string team, string part, global::System.Nullable 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 ((Original_code == null)) { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + if ((plant == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_code)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(plant)); + } + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + 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 = ((string)(Original_team)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + 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 = ((string)(Original_part)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + 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 = ((bool)(Original_except.Value)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + 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 = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + 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 = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + 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 = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); + 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 except, string memo, string wuid, System.DateTime wdate, int Original_idx, string Original_code, string Original_team, string Original_part, global::System.Nullable Original_except, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { - 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); + public virtual int Update( + string code, + string team, + string part, + global::System.Nullable 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 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); } } diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 1502fd6..4a22a10 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -588,10 +588,10 @@ ORDER BY pdate - + - 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)) + 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))) @@ -605,14 +605,16 @@ ORDER BY pdate - + + + - INSERT INTO [LineCode] ([code], [team], [part], [except], [memo], [wuid], [wdate]) VALUES (@code, @team, @part, @except, @memo, @wuid, @wdate); -SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = SCOPE_IDENTITY()) + 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, plant FROM LineCode WHERE (idx = SCOPE_IDENTITY()) @@ -620,21 +622,22 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i - + + - SELECT idx, code, team, part, [except], memo, wuid, wdate + SELECT idx, code, team, part, [except], memo, wuid, wdate, plant FROM LineCode - 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)); -SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (idx = @idx) + 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, plant FROM LineCode WHERE (idx = @idx) @@ -642,7 +645,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i - + + @@ -655,8 +659,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i - - + + + + @@ -671,6 +677,7 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i + @@ -1135,7 +1142,7 @@ WHERE (idx = @idx) - + @@ -1276,7 +1283,7 @@ WHERE (idx = @idx) - + @@ -1347,7 +1354,7 @@ WHERE (idx = @idx) - + @@ -1405,7 +1412,7 @@ WHERE (idx = @idx) - + @@ -1475,7 +1482,7 @@ WHERE (idx = @idx) - + @@ -1516,10 +1523,17 @@ WHERE (idx = @idx) + + + + + + + - + @@ -1548,7 +1562,7 @@ WHERE (idx = @idx) - + @@ -1664,7 +1678,7 @@ WHERE (idx = @idx) - + @@ -1691,9 +1705,9 @@ WHERE (idx = @idx) - - - + + + @@ -1703,7 +1717,7 @@ WHERE (idx = @idx) - + @@ -1819,7 +1833,7 @@ WHERE (idx = @idx) - + diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 0a76ac8..9f91642 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -6,16 +6,16 @@ --> - + - + - - - - - - + + + + + + \ No newline at end of file diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 4fe65b0..c1c892d 100644 --- a/Project/fMain.Designer.cs +++ b/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.accessDBToolStripMenuItem.Size = new System.Drawing.Size(278, 24); - this.accessDBToolStripMenuItem.Text = "Access DB"; - this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click); + this.summaryToolStripMenuItem.Name = "summaryToolStripMenuItem"; + this.summaryToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.summaryToolStripMenuItem.Text = "Summary"; + this.summaryToolStripMenuItem.Click += new System.EventHandler(this.summaryToolStripMenuItem_Click); // // fMain // @@ -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; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index b37d181..b646ed5 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -123,7 +123,7 @@ namespace Project Func_Login(); - + Update_Site(); bw.RunWorkerAsync(); //background worker @@ -136,11 +136,12 @@ namespace Project { WebApp.Start(url: "http://127.0.0.1:9000"); Console.WriteLine("start webapp"); - }catch (Exception ex) + } + catch (Exception ex) { Console.WriteLine(ex.Message); } - + //서버ON @@ -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(), "장비전체요약"); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 3f7b8a6..436292d 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -374,53 +374,53 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB - QwoXhVCNrK1o6oJog+iDkJrIvjRlkJT0AtZlMELoPYpYM9q3BcGmjtjm3e56OT3nd68sUaEHLvtw73nO - ec45U/87WUP5vhpqTn4L8tgpQ/1+bKg/7uuNRz4eyxgqT0C+9wgWgmewOHgOS2E/5B3cz9aOsHnnm1Qu - 17oVC4HTKF73ozQSQCm0C8uRVvycHUA1uMGC7CYVSxvKyp86hmKkHz+utMOKemCP7EB9zHl+JQdhX11n - QbZJTYu0+uLAWZRuB1AJb0PdBdpTu1F71oXqq6Owc6Mov21evYDMBC8NnUd5IojaLY8DTLSh+vwQrHQP - rC8n9WN/H0f5vaexgDdTNpkJtoe3a3DtSQesj14N+pb24v7LboSSbRj9MIQtsX9OoGG8mbJXmGtmN6zM - CSwLePpFF3yzO9HxqAV7HzYj+i6EzRPuAkbFTIs3LqByraXBLODC5x7cTO1Bpws8Hg+gbzyBuPkJBy7N - OAuYM6OqxC5rw3gzZZOZ4H0CPHjvMPruJDBpZjBlzuPu04yzQNh9LAlzZlRk14a5sslMcDie1MDo5Bv0 - RkwBx2v7+2de07w5NowlYc6Mim7TMN5M2WQm2D+c0sDOiw/atXSOKCiwnmyYvl1yJjvdpmG8mbLJTLAL - a4wssNlt1lPLl5JwAaPS7GIY2Sl7FfPK8H7+MdhtXU9pGEvCnBkV3XYMW4edw/hEhf5jsNusJxvGkjBn - Os1HG7ZmlPoLbev0XNP6gcQAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB + QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQYgTUGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z + nnPO1P9OzlC+r4aal9+iPHbaUL9nDfXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn + W7djMXAWpZt+lEcCKIf2YCXSip9zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss + yDWpaZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg + fjmtH/v7OCrvPY0FvJmyyUywPbxTg60nHTA/ejXoW8aLhy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn + sCLg6Rdd8M3tRsfjFuyfbUb0XQhbJ9wFjIqZlm5dQvVGS4NZwMXPPbid3odOF3gyHkDfeALx5CccujLj + LGDOjKoau6oN482UTWaCDwjw8IOj6LuXwGQyi6nkAu4/zToLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv + JCnguHWwf+Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/KhdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw + xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm + 03y0YetGqb9hx/RWhn9qhQAAAABJRU5ErkJggg== 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 diff --git a/SubProject/FEQ0000/Equipment/ReportB.rdlc b/SubProject/FEQ0000/Equipment/ReportB.rdlc index ffc1b82..1673f8d 100644 --- a/SubProject/FEQ0000/Equipment/ReportB.rdlc +++ b/SubProject/FEQ0000/Equipment/ReportB.rdlc @@ -1,1102 +1,1289 @@ - - - - - - - - - - - - true - true - - - - - Process - - - - - - - Textbox7 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - G-TTL - - - - - - - Textbox19 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Manufacturer - - - - - - - Textbox4 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Model - - - - - - - Textbox30 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - - - - - - - - - - 1.65273cm - - - 1.12416cm - - - 3.21437cm - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt1 - - - WhiteSmoke - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Remark.Value - - - - - - - Remark - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt4 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt5 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - - - - - - - - Textbox9 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - =Fields!lineT.Value - - - - - =Fields!lineT.Value - - - - 0.6cm - - - true - true - - - - - =Fields!lineT.Value - - - - - - - team - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!lineP.Value - - - - - =Fields!lineP.Value - Descending - - - - 0.6cm - - - true - true - - - - - =Fields!lineP.Value - - - - - - - part - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - 1.2cm - - - true - true - - - - - Sub -Total - - - - - - - Textbox16 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.2cm - - - true - true - - - - - Remark - - - - - - - Textbox1 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - =Fields!grp.Value - - - - - =Fields!grp.Value - - - - 4.96062cm - - - true - true - - - - - =Fields!grp.Value - - - - - - - grp - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt6 - - - Khaki - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!manu.Value - - - - - =Fields!manu.Value - - - - - - 3.02917cm - - - true - true - - - - - =Fields!manu.Value - - - - - - - manu - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!model.Value - - - - - =Fields!model.Value - - - - 3.26729cm - - - true - true - - - - - =Fields!model.Value - - - - - - - model - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - 4.96062cm - - - true - true - - - - - 합계 - - - - - - - Textbox10 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox23 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.02917cm - - - true - true - - - - - - - - - - - - Textbox11 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.26729cm - - - true - true - - - - - - - - - - - - Textbox34 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - Before - - - - DataSet1 - 2.4cm - 18.71646cm - - - 맑은 고딕 - 8pt - - - - 0.94488in - + + + + + + Textbox2 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + G-TTL + + + + + + + Textbox3 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Manufacturer + + + + + + + Textbox5 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Model + + + + + + + Textbox6 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + + + + + + + + + + + + + + + + 1.65273cm + + + 1.01833cm + + + 1.12416cm + + + 3.21437cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox18 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt1 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Remark.Value + + + + + + + Remark + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt4 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox20 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt5 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox9 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + =Fields!plant.Value + + + + + =Fields!plant.Value + + + + 0.6cm + + + true + true + + + + + =Fields!plant.Value + + + + + + + plant + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineT.Value + + + + + =Fields!lineT.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineT.Value + + + + + + + team + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineP.Value + + + + + =Fields!lineP.Value + Descending + + + + 0.6cm + + + true + true + + + + + =Fields!lineP.Value + + + + + + + part + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + 1.2cm + + + true + true + + + + + Sub +Total + + + + + + + Textbox15 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.8cm + + + true + true + + + + + Total + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.8cm + + + true + true + + + + + Remark + + + + + + + Textbox13 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!grp.Value + + + + + =Fields!grp.Value + + + + 4.96062cm + + + true + true + + + + + =Fields!grp.Value + + + + + + + grp + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt6 + + + Khaki + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!manu.Value + + + + + =Fields!manu.Value + + + + + + 3.02917cm + + + true + true + + + + + =Fields!manu.Value + + + + + + + manu + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!model.Value + + + + + =Fields!model.Value + + + + 3.26729cm + + + true + true + + + + + =Fields!model.Value + + + + + + + model + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + 4.96062cm + + + true + true + + + + + 합계 + + + + + + + Textbox10 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox23 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.02917cm + + + true + true + + + + + + + + + + + + Textbox11 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.26729cm + + + true + true + + + + + + + + + + + + Textbox34 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + Before + + + + true + true + true + true + DataSet1 + 3cm + 19.73479cm + + + 맑은 고딕 + 8pt + + + + 1.1811in + - - - - - - Textbox7 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - G-TTL - - - - - - - Textbox19 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Manufacturer - - - - - - - Textbox4 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Model - - - - - - - Textbox30 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - - - - - - - - - - 0.96481cm - - - 0.93895cm - - - 3.21437cm - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt1 - - - WhiteSmoke - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Remark.Value - - - - - - - Remark - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt4 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt5 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - - - - - - - - Textbox9 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - =Fields!lineT.Value - - - - - =Fields!lineT.Value - - - - 0.6cm - - - true - true - - - - - =Fields!lineT.Value - - - - - - - team - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!lineP.Value - - - - - =Fields!lineP.Value - - - - 0.6cm - - - true - true - - - - - =Fields!lineP.Value - - - - - - - part - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - 1.2cm - - - true - true - - - - - Sub -Total - - - - - - - Textbox16 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.2cm - - - true - true - - - - - Remark - - - - - - - Textbox1 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - =Fields!grp.Value - - - - - =Fields!grp.Value - - - - 4.96062cm - - - true - true - - - - - =Fields!grp.Value - - - - - - - grp - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt6 - - - Khaki - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!manu.Value - - - - - =Fields!manu.Value - - - - - - 3.02917cm - - - true - true - - - - - =Fields!manu.Value - - - - - - - manu - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!model.Value - - - - - =Fields!model.Value - - - - 3.26729cm - - - true - true - - - - - =Fields!model.Value - - - - - - - model - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - 4.96062cm - - - true - true - - - - - 합계 - - - - - - - Textbox10 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox23 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.02917cm - - - true - true - - - - - - - - - - - - Textbox11 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.26729cm - - - true - true - - - - - - - - - - - - Textbox34 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - Before - - - - DataSet1 - 2.4cm - 17.84334cm - - - 맑은 고딕 - 8pt - - - - 0.94488in - - - - - - - Textbox2 - 0.14111cm - 0.127cm - 0.64029cm - 4.79087cm - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Globals!OverallPageNumber & "/" & Globals!OverallTotalPages - - - - - - - Textbox2 - 0.14111cm - 5.10526cm - 0.64029cm - 17.3813cm - 1 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Globals!ExecutionTime - - - - - - - Textbox2 - 0.14111cm - 22.66295cm - 0.64029cm - 4.79087cm - 2 - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 21cm - 29.7cm - 1cm - 1cm - 1cm - 1cm - 0.13cm - + + + + + + Textbox6 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + G-TTL + + + + + + + Textbox8 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Manufacturer + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Model + + + + + + + Textbox13 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + + + + + + + + + + + + + + + + 0.96481cm + + + 0.93896cm + + + 0.93895cm + + + 3.21437cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox22 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt1 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Remark.Value + + + + + + + Remark + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt4 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox24 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt5 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox9 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + =Fields!plant.Value + + + + + =Fields!plant.Value + + + + 0.6cm + + + true + true + + + + + =Fields!plant.Value + + + + + + + plant + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineT.Value + + + + + =Fields!lineT.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineT.Value + + + + + + + team + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineP.Value + + + + + =Fields!lineP.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineP.Value + + + + + + + part + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + 1.2cm + + + true + true + + + + + Sub +Total + + + + + + + Textbox20 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.8cm + + + true + true + + + + + Total + + + + + + + Textbox15 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.8cm + + + true + true + + + + + Remark + + + + + + + Textbox17 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!grp.Value + + + + + =Fields!grp.Value + + + + 4.96062cm + + + true + true + + + + + =Fields!grp.Value + + + + + + + grp + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt6 + + + Khaki + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!manu.Value + + + + + =Fields!manu.Value + + + + + + 3.02917cm + + + true + true + + + + + =Fields!manu.Value + + + + + + + manu + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!model.Value + + + + + =Fields!model.Value + + + + 3.26729cm + + + true + true + + + + + =Fields!model.Value + + + + + + + model + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + 4.96062cm + + + true + true + + + + + 합계 + + + + + + + Textbox10 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox23 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.02917cm + + + true + true + + + + + + + + + + + + Textbox11 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.26729cm + + + true + true + + + + + + + + + + + + Textbox34 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + Before + + + + true + true + DataSet1 + 3cm + 18.78229cm + + + 맑은 고딕 + 8pt + + + + 1.1811in + + + + + + + Textbox2 + 0.14111cm + 0.127cm + 0.64029cm + 4.79087cm + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!OverallPageNumber & "/" & Globals!OverallTotalPages + + + + + + + Textbox2 + 0.14111cm + 5.10526cm + 0.64029cm + 17.3813cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!ExecutionTime + + + + + + + Textbox2 + 0.14111cm + 22.66295cm + 0.64029cm + 4.79087cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 21cm + 29.7cm + 1cm + 1cm + 1cm + 1cm + 0.13cm + - - - - - - Textbox7 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - G-TTL - - - - - - - Textbox19 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Manufacturer - - - - - - - Textbox4 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - true - true - - - - - Model - - - - - - - Textbox30 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - 2 - - - - - - - - - - - - - - - 0.99127cm - - - 0.91249cm - - - 3.21437cm - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt1 - - - WhiteSmoke - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Remark.Value - - - - - - - Remark - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt4 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt5 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - - - - - - - - Textbox9 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - =Fields!lineT.Value - - - - - =Fields!lineT.Value - - - - 0.6cm - - - true - true - - - - - =Fields!lineT.Value - - - - - - - team - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!lineP.Value - - - - - =Fields!lineP.Value - - - - 0.6cm - - - true - true - - - - - =Fields!lineP.Value - - - - - - - part - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - 1.2cm - - - true - true - - - - - Sub -Total - - - - - - - Textbox16 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.2cm - - - true - true - - - - - Remark - - - - - - - Textbox1 - - - Silver - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - =Fields!grp.Value - - - - - =Fields!grp.Value - - - - 4.96062cm - - - true - true - - - - - =Fields!grp.Value - - - - - - - grp - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - cnt6 - - - Khaki - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!manu.Value - - - - - =Fields!manu.Value - - - - - - 3.02917cm - - - true - true - - - - - =Fields!manu.Value - - - - - - - manu - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - =Fields!model.Value - - - - - =Fields!model.Value - - - - 3.26729cm - - - true - true - - - - - =Fields!model.Value - - - - - - - model - - - White - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - 4.96062cm - - - true - true - - - - - 합계 - - - - - - - Textbox10 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 1.46812cm - - - true - true - - - - - =Sum(Fields!cnt.Value) - - - - - - - Textbox23 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.02917cm - - - true - true - - - - - - - - - - - - Textbox11 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3.26729cm - - - true - true - - - - - - - - - - - - Textbox34 - - - #7292cc - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - Before - - - - DataSet1 - 2.4cm - 17.84334cm - - - 맑은 고딕 - 8pt - - - - 0.94488in - - - - - - - Textbox2 - 0.14111cm - 0.127cm - 0.64029cm - 4.79087cm - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Globals!OverallPageNumber & "/" & Globals!OverallTotalPages - - - - - - - Textbox2 - 0.14111cm - 5.10526cm - 0.64029cm - 17.3813cm - 1 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Globals!ExecutionTime - - - - - - - Textbox2 - 0.14111cm - 22.66295cm - 0.64029cm - 4.79087cm - 2 - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 21cm - 29.7cm - 1cm - 1cm - 1cm - 1cm - 0.13cm - + + + + + + Textbox6 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + G-TTL + + + + + + + Textbox8 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Manufacturer + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Model + + + + + + + Textbox13 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + + + + + + + + + + + + + + + + 0.99127cm + + + 0.9125cm + + + 0.91249cm + + + 3.21437cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox35 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt1 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Remark.Value + + + + + + + Remark + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt4 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox36 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt5 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox9 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + =Fields!plant.Value + + + + + =Fields!plant.Value + + + + 0.6cm + + + true + true + + + + + =Fields!plant.Value + + + + + + + plant + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineT.Value + + + + + =Fields!lineT.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineT.Value + + + + + + + team + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineP.Value + + + + + =Fields!lineP.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineP.Value + + + + + + + part + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + 1.2cm + + + true + true + + + + + Sub Total + + + + + + + Textbox32 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.8cm + + + true + true + + + + + Total + + + + + + + Textbox15 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.8cm + + + true + true + + + + + Remark + + + + + + + Textbox17 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!grp.Value + + + + + =Fields!grp.Value + + + + 4.96062cm + + + true + true + + + + + =Fields!grp.Value + + + + + + + grp + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt6 + + + Khaki + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!manu.Value + + + + + =Fields!manu.Value + + + + + + 3.02917cm + + + true + true + + + + + =Fields!manu.Value + + + + + + + manu + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!model.Value + + + + + =Fields!model.Value + + + + 3.26729cm + + + true + true + + + + + =Fields!model.Value + + + + + + + model + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + 4.96062cm + + + true + true + + + + + 합계 + + + + + + + Textbox10 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox23 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.02917cm + + + true + true + + + + + + + + + + + + Textbox11 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.26729cm + + + true + true + + + + + + + + + + + + Textbox34 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + Before + + + + true + true + DataSet1 + 3cm + 18.75583cm + + + 맑은 고딕 + 8pt + + + + 1.1811in + + + + + + + Textbox2 + 0.14111cm + 0.127cm + 0.64029cm + 4.79087cm + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!OverallPageNumber & "/" & Globals!OverallTotalPages + + + + + + + Textbox2 + 0.14111cm + 5.10526cm + 0.64029cm + 17.3813cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!ExecutionTime + + + + + + + Textbox2 + 0.14111cm + 22.66295cm + 0.64029cm + 4.79087cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 21cm + 29.7cm + 1cm + 1cm + 1cm + 1cm + 0.13cm + - Textbox7 + Textbox6 - 2 + 3 - + true true @@ -68,7 +68,7 @@ - Textbox19 + Textbox8 - 2 + 3 - + true true @@ -107,7 +107,7 @@ - Textbox4 + Textbox12 - 2 + 3 - + true true @@ -146,7 +146,7 @@ - Textbox30 + Textbox13 - 2 + 3 @@ -170,6 +170,12 @@ + + + + + + @@ -177,6 +183,9 @@ 0.99127cm + + 0.96542cm + 0.91249cm @@ -227,6 +236,45 @@ + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox22 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -349,6 +397,45 @@ + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox24 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -434,27 +521,27 @@ - + - =Fields!lineT.Value + =Fields!plant.Value - =Fields!lineT.Value + =Fields!plant.Value 0.6cm - + true true - =Fields!lineT.Value + =Fields!plant.Value - team + plant - part + team + + + + + + part + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 1.2cm + + + true + true + + + + + Sub +Total + + + + + + + Textbox20 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + - 1.2cm + 1.8cm - + true true - Sub -Total + Total - Textbox16 + Textbox15 - Textbox1 + Textbox17 @@ -1018,7 +1199,7 @@ Total - 0.94488in + 1.1811in + + + + + + Textbox6 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + G-TTL + + + + + + + Textbox8 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Manufacturer + + + + + + + Textbox12 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + true + true + + + + + Model + + + + + + + Textbox13 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + 3 + + + + + + + + + + + + + + + + + + + + + 0.99127cm + + + 0.88604cm + + + 0.91249cm + + + 3.21437cm + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox50 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt1 + + + WhiteSmoke + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Remark.Value + + + + + + + Remark + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt4 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox51 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt5 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + + + + Textbox9 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + =Fields!plant.Value + + + + + =Fields!plant.Value + + + + 0.6cm + + + true + true + + + + + =Fields!plant.Value + + + + + + + plant + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineT.Value + + + + + =Fields!lineT.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineT.Value + + + + + + + team + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!lineP.Value + + + + + =Fields!lineP.Value + + + + 0.6cm + + + true + true + + + + + =Fields!lineP.Value + + + + + + + part + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + 1.2cm + + + true + true + + + + + Sub +Total + + + + + + + Textbox48 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + 1.8cm + + + true + true + + + + + Total + + + + + + + Textbox15 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.8cm + + + true + true + + + + + Remark + + + + + + + Textbox17 + + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + =Fields!grp.Value + + + + + =Fields!grp.Value + + + + 4.96062cm + + + true + true + + + + + =Fields!grp.Value + + + + + + + grp + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + cnt6 + + + Khaki + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!manu.Value + + + + + =Fields!manu.Value + + + + + + 3.02917cm + + + true + true + + + + + =Fields!manu.Value + + + + + + + manu + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + =Fields!model.Value + + + + + =Fields!model.Value + + + + 3.26729cm + + + true + true + + + + + =Fields!model.Value + + + + + + + model + + + White + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + 4.96062cm + + + true + true + + + + + 합계 + + + + + + + Textbox10 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 1.46812cm + + + true + true + + + + + =Sum(Fields!cnt.Value) + + + + + + + Textbox23 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.02917cm + + + true + true + + + + + + + + + + + + Textbox11 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 3.26729cm + + + true + true + + + + + + + + + + + + Textbox34 + + + #7292cc + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + Before + + + + true + true + DataSet1 + 3cm + 18.72937cm + + + 맑은 고딕 + 8pt + + + + 1.1811in + + + + + + + Textbox2 + 0.14111cm + 0.127cm + 0.64029cm + 4.79087cm + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!OverallPageNumber & "/" & Globals!OverallTotalPages + + + + + + + Textbox2 + 0.14111cm + 5.10526cm + 0.64029cm + 17.3813cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Globals!ExecutionTime + + + + + + + Textbox2 + 0.14111cm + 22.66295cm + 0.64029cm + 4.79087cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 21cm + 29.7cm + 1cm + 1cm + 1cm + 1cm + 0.13cm +