diff --git a/MultiTool.Form/CREATE_DATABASE.sql b/MultiTool.Form/CREATE_DATABASE.sql index 441205f..aa2d56b 100644 --- a/MultiTool.Form/CREATE_DATABASE.sql +++ b/MultiTool.Form/CREATE_DATABASE.sql @@ -10,11 +10,11 @@ ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WH GO ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ACTIVE] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN] +ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHEN] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO] +ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHO] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ACTIVE] +ALTER TABLE [dbo].[TBMT_TEMPLATES] DROP CONSTRAINT [DF_TBMT_TEMPLATES_ACTIVE] GO ALTER TABLE [dbo].[TBMT_TABLES] DROP CONSTRAINT [DF_TBMT_TABLES_ADDED_WHEN] GO @@ -72,9 +72,9 @@ GO IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TYPES]') AND type in (N'U')) DROP TABLE [dbo].[TBEDI_XML_TYPES] GO -/****** Object: Table [dbo].[TBEDI_XML_TEMPLATES] Script Date: 26.11.2021 16:07:58 ******/ -IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATES]') AND type in (N'U')) -DROP TABLE [dbo].[TBEDI_XML_TEMPLATES] +/****** Object: Table [dbo].[TBMT_TEMPLATES] Script Date: 26.11.2021 16:07:58 ******/ +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_TEMPLATES]') AND type in (N'U')) +DROP TABLE [dbo].[TBMT_TEMPLATES] GO /****** Object: Table [dbo].[TBMT_TABLES] Script Date: 26.11.2021 16:07:58 ******/ IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_TABLES]') AND type in (N'U')) @@ -264,12 +264,12 @@ CREATE TABLE [dbo].[TBMT_TABLES]( )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO -/****** Object: Table [dbo].[TBEDI_XML_TEMPLATES] Script Date: 26.11.2021 16:07:58 ******/ +/****** Object: Table [dbo].[TBMT_TEMPLATES] Script Date: 26.11.2021 16:07:58 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO -CREATE TABLE [dbo].[TBEDI_XML_TEMPLATES]( +CREATE TABLE [dbo].[TBMT_TEMPLATES]( [GUID] [int] IDENTITY(1,1) NOT NULL, [NAME] [nvarchar](20) NOT NULL, [DESCRIPTION] [nvarchar](max) NULL, @@ -485,11 +485,11 @@ INSERT [dbo].[TBMT_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD], [ACTIVE], GO SET IDENTITY_INSERT [dbo].[TBMT_TABLES] OFF GO -SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] ON +SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATES] ON GO -INSERT [dbo].[TBEDI_XML_TEMPLATES] ([GUID], [NAME], [DESCRIPTION], [FILE_NAME], [IS_IMPORT], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge', N'MESOBelegeEXIM-VRG_orders.xsd', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBMT_TEMPLATES] ([GUID], [NAME], [DESCRIPTION], [FILE_NAME], [IS_IMPORT], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge', N'MESOBelegeEXIM-VRG_orders.xsd', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] OFF +SET IDENTITY_INSERT [dbo].[TBMT_TEMPLATES] OFF GO SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] ON GO @@ -561,11 +561,11 @@ ALTER TABLE [dbo].[TBMT_TABLES] ADD CONSTRAINT [DF_TBMT_TABLES_ADDED_WHO] DEFA GO ALTER TABLE [dbo].[TBMT_TABLES] ADD CONSTRAINT [DF_TBMT_TABLES_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] +ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD CONSTRAINT [DF_TBMT_TEMPLATES_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHO] DEFAULT (N'DEFAULT') FOR [ADDED_WHO] +ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHO] DEFAULT (N'DEFAULT') FOR [ADDED_WHO] GO -ALTER TABLE [dbo].[TBEDI_XML_TEMPLATES] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATES_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] +ALTER TABLE [dbo].[TBMT_TEMPLATES] ADD CONSTRAINT [DF_TBMT_TEMPLATES_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] GO ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD CONSTRAINT [DF_TBEDI_XML_TYPES_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] GO diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb index a00034c..927edd0 100644 --- a/MultiTool.Form/DS_DD_ECM.Designer.vb +++ b/MultiTool.Form/DS_DD_ECM.Designer.vb @@ -29,7 +29,7 @@ Partial Public Class DS_DD_ECM Private tableTBEDI_XML_TYPES As TBEDI_XML_TYPESDataTable - Private tableTBEDI_XML_TEMPLATES As TBEDI_XML_TEMPLATESDataTable + Private tableTBMT_TEMPLATES As TBMT_TEMPLATESDataTable Private tableTBEDI_XML_NODES As TBEDI_XML_NODESDataTable @@ -41,7 +41,7 @@ Partial Public Class DS_DD_ECM Private relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES As Global.System.Data.DataRelation - Private relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES As Global.System.Data.DataRelation + Private relationTBEDI_XML_NODES_TBMT_TEMPLATES As Global.System.Data.DataRelation Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema @@ -78,8 +78,8 @@ Partial Public Class DS_DD_ECM If (Not (ds.Tables("TBEDI_XML_TYPES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_TYPESDataTable(ds.Tables("TBEDI_XML_TYPES"))) End If - If (Not (ds.Tables("TBEDI_XML_TEMPLATES")) Is Nothing) Then - MyBase.Tables.Add(New TBEDI_XML_TEMPLATESDataTable(ds.Tables("TBEDI_XML_TEMPLATES"))) + If (Not (ds.Tables("TBMT_TEMPLATES")) Is Nothing) Then + MyBase.Tables.Add(New TBMT_TEMPLATESDataTable(ds.Tables("TBMT_TEMPLATES"))) End If If (Not (ds.Tables("TBEDI_XML_NODES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_NODESDataTable(ds.Tables("TBEDI_XML_NODES"))) @@ -131,9 +131,9 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Browsable(false), _ Global.System.ComponentModel.DesignerSerializationVisibility(Global.System.ComponentModel.DesignerSerializationVisibility.Content)> _ - Public ReadOnly Property TBEDI_XML_TEMPLATES() As TBEDI_XML_TEMPLATESDataTable + Public ReadOnly Property TBMT_TEMPLATES() As TBMT_TEMPLATESDataTable Get - Return Me.tableTBEDI_XML_TEMPLATES + Return Me.tableTBMT_TEMPLATES End Get End Property @@ -240,8 +240,8 @@ Partial Public Class DS_DD_ECM If (Not (ds.Tables("TBEDI_XML_TYPES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_TYPESDataTable(ds.Tables("TBEDI_XML_TYPES"))) End If - If (Not (ds.Tables("TBEDI_XML_TEMPLATES")) Is Nothing) Then - MyBase.Tables.Add(New TBEDI_XML_TEMPLATESDataTable(ds.Tables("TBEDI_XML_TEMPLATES"))) + If (Not (ds.Tables("TBMT_TEMPLATES")) Is Nothing) Then + MyBase.Tables.Add(New TBMT_TEMPLATESDataTable(ds.Tables("TBMT_TEMPLATES"))) End If If (Not (ds.Tables("TBEDI_XML_NODES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_NODESDataTable(ds.Tables("TBEDI_XML_NODES"))) @@ -296,10 +296,10 @@ Partial Public Class DS_DD_ECM Me.tableTBEDI_XML_TYPES.InitVars End If End If - Me.tableTBEDI_XML_TEMPLATES = CType(MyBase.Tables("TBEDI_XML_TEMPLATES"),TBEDI_XML_TEMPLATESDataTable) + Me.tableTBMT_TEMPLATES = CType(MyBase.Tables("TBMT_TEMPLATES"),TBMT_TEMPLATESDataTable) If (initTable = true) Then - If (Not (Me.tableTBEDI_XML_TEMPLATES) Is Nothing) Then - Me.tableTBEDI_XML_TEMPLATES.InitVars + If (Not (Me.tableTBMT_TEMPLATES) Is Nothing) Then + Me.tableTBMT_TEMPLATES.InitVars End If End If Me.tableTBEDI_XML_NODES = CType(MyBase.Tables("TBEDI_XML_NODES"),TBEDI_XML_NODESDataTable) @@ -322,7 +322,7 @@ Partial Public Class DS_DD_ECM End If Me.relationTBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS = Me.Relations("TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS") Me.relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES = Me.Relations("TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES") - Me.relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES = Me.Relations("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES") + Me.relationTBEDI_XML_NODES_TBMT_TEMPLATES = Me.Relations("TBEDI_XML_NODES_TBMT_TEMPLATES") End Sub _ - Private Function ShouldSerializeTBEDI_XML_TEMPLATES() As Boolean + Private Function ShouldSerializeTBMT_TEMPLATES() As Boolean Return false End Function @@ -454,7 +454,7 @@ Partial Public Class DS_DD_ECM Public Delegate Sub TBEDI_XML_TYPESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_TYPESRowChangeEvent) _ - Public Delegate Sub TBEDI_XML_TEMPLATESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_TEMPLATESRowChangeEvent) + Public Delegate Sub TBMT_TEMPLATESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBMT_TEMPLATESRowChangeEvent) _ Public Delegate Sub TBEDI_XML_NODESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_NODESRowChangeEvent) @@ -1210,8 +1210,8 @@ Partial Public Class DS_DD_ECM ''' _ - Partial Public Class TBEDI_XML_TEMPLATESDataTable - Inherits Global.System.Data.TypedTableBase(Of TBEDI_XML_TEMPLATESRow) + Partial Public Class TBMT_TEMPLATESDataTable + Inherits Global.System.Data.TypedTableBase(Of TBMT_TEMPLATESRow) Private columnGUID As Global.System.Data.DataColumn @@ -1223,7 +1223,7 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New - Me.TableName = "TBEDI_XML_TEMPLATES" + Me.TableName = "TBMT_TEMPLATES" Me.BeginInit Me.InitClass Me.EndInit @@ -1289,50 +1289,50 @@ Partial Public Class DS_DD_ECM _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBEDI_XML_TEMPLATESRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBMT_TEMPLATESRow Get - Return CType(Me.Rows(index),TBEDI_XML_TEMPLATESRow) + Return CType(Me.Rows(index),TBMT_TEMPLATESRow) End Get End Property _ - Public Event TBEDI_XML_TEMPLATESRowChanging As TBEDI_XML_TEMPLATESRowChangeEventHandler + Public Event TBMT_TEMPLATESRowChanging As TBMT_TEMPLATESRowChangeEventHandler _ - Public Event TBEDI_XML_TEMPLATESRowChanged As TBEDI_XML_TEMPLATESRowChangeEventHandler + Public Event TBMT_TEMPLATESRowChanged As TBMT_TEMPLATESRowChangeEventHandler _ - Public Event TBEDI_XML_TEMPLATESRowDeleting As TBEDI_XML_TEMPLATESRowChangeEventHandler + Public Event TBMT_TEMPLATESRowDeleting As TBMT_TEMPLATESRowChangeEventHandler _ - Public Event TBEDI_XML_TEMPLATESRowDeleted As TBEDI_XML_TEMPLATESRowChangeEventHandler + Public Event TBMT_TEMPLATESRowDeleted As TBMT_TEMPLATESRowChangeEventHandler _ - Public Overloads Sub AddTBEDI_XML_TEMPLATESRow(ByVal row As TBEDI_XML_TEMPLATESRow) + Public Overloads Sub AddTBMT_TEMPLATESRow(ByVal row As TBMT_TEMPLATESRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBEDI_XML_TEMPLATESRow(ByVal NAME As String, ByVal DESCRIPTION As String) As TBEDI_XML_TEMPLATESRow - Dim rowTBEDI_XML_TEMPLATESRow As TBEDI_XML_TEMPLATESRow = CType(Me.NewRow,TBEDI_XML_TEMPLATESRow) + Public Overloads Function AddTBMT_TEMPLATESRow(ByVal NAME As String, ByVal DESCRIPTION As String) As TBMT_TEMPLATESRow + Dim rowTBMT_TEMPLATESRow As TBMT_TEMPLATESRow = CType(Me.NewRow,TBMT_TEMPLATESRow) Dim columnValuesArray() As Object = New Object() {Nothing, NAME, DESCRIPTION} - rowTBEDI_XML_TEMPLATESRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBEDI_XML_TEMPLATESRow) - Return rowTBEDI_XML_TEMPLATESRow + rowTBMT_TEMPLATESRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBMT_TEMPLATESRow) + Return rowTBMT_TEMPLATESRow End Function _ - Public Function FindByGUID(ByVal GUID As Integer) As TBEDI_XML_TEMPLATESRow - Return CType(Me.Rows.Find(New Object() {GUID}),TBEDI_XML_TEMPLATESRow) + Public Function FindByGUID(ByVal GUID As Integer) As TBMT_TEMPLATESRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBMT_TEMPLATESRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBEDI_XML_TEMPLATESDataTable = CType(MyBase.Clone,TBEDI_XML_TEMPLATESDataTable) + Dim cln As TBMT_TEMPLATESDataTable = CType(MyBase.Clone,TBMT_TEMPLATESDataTable) cln.InitVars Return cln End Function @@ -1340,7 +1340,7 @@ Partial Public Class DS_DD_ECM _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBEDI_XML_TEMPLATESDataTable() + Return New TBMT_TEMPLATESDataTable() End Function _ - Public Function NewTBEDI_XML_TEMPLATESRow() As TBEDI_XML_TEMPLATESRow - Return CType(Me.NewRow,TBEDI_XML_TEMPLATESRow) + Public Function NewTBMT_TEMPLATESRow() As TBMT_TEMPLATESRow + Return CType(Me.NewRow,TBMT_TEMPLATESRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBEDI_XML_TEMPLATESRow(builder) + Return New TBMT_TEMPLATESRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBEDI_XML_TEMPLATESRow) + Return GetType(TBMT_TEMPLATESRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBEDI_XML_TEMPLATESRowChangedEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_TEMPLATESRowChanged(Me, New TBEDI_XML_TEMPLATESRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATESRow), e.Action)) + If (Not (Me.TBMT_TEMPLATESRowChangedEvent) Is Nothing) Then + RaiseEvent TBMT_TEMPLATESRowChanged(Me, New TBMT_TEMPLATESRowChangeEvent(CType(e.Row,TBMT_TEMPLATESRow), e.Action)) End If End Sub @@ -1403,8 +1403,8 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBEDI_XML_TEMPLATESRowChangingEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_TEMPLATESRowChanging(Me, New TBEDI_XML_TEMPLATESRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATESRow), e.Action)) + If (Not (Me.TBMT_TEMPLATESRowChangingEvent) Is Nothing) Then + RaiseEvent TBMT_TEMPLATESRowChanging(Me, New TBMT_TEMPLATESRowChangeEvent(CType(e.Row,TBMT_TEMPLATESRow), e.Action)) End If End Sub @@ -1412,8 +1412,8 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBEDI_XML_TEMPLATESRowDeletedEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_TEMPLATESRowDeleted(Me, New TBEDI_XML_TEMPLATESRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATESRow), e.Action)) + If (Not (Me.TBMT_TEMPLATESRowDeletedEvent) Is Nothing) Then + RaiseEvent TBMT_TEMPLATESRowDeleted(Me, New TBMT_TEMPLATESRowChangeEvent(CType(e.Row,TBMT_TEMPLATESRow), e.Action)) End If End Sub @@ -1421,14 +1421,14 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBEDI_XML_TEMPLATESRowDeletingEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_TEMPLATESRowDeleting(Me, New TBEDI_XML_TEMPLATESRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATESRow), e.Action)) + If (Not (Me.TBMT_TEMPLATESRowDeletingEvent) Is Nothing) Then + RaiseEvent TBMT_TEMPLATESRowDeleting(Me, New TBMT_TEMPLATESRowChangeEvent(CType(e.Row,TBMT_TEMPLATESRow), e.Action)) End If End Sub _ - Public Sub RemoveTBEDI_XML_TEMPLATESRow(ByVal row As TBEDI_XML_TEMPLATESRow) + Public Sub RemoveTBMT_TEMPLATESRow(ByVal row As TBMT_TEMPLATESRow) Me.Rows.Remove(row) End Sub @@ -1455,7 +1455,7 @@ Partial Public Class DS_DD_ECM type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBEDI_XML_TEMPLATESDataTable" + attribute2.FixedValue = "TBMT_TEMPLATESDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -2842,26 +2842,26 @@ Partial Public Class DS_DD_ECM ''' '''Represents strongly named DataRow class. ''' - Partial Public Class TBEDI_XML_TEMPLATESRow + Partial Public Class TBMT_TEMPLATESRow Inherits Global.System.Data.DataRow - Private tableTBEDI_XML_TEMPLATES As TBEDI_XML_TEMPLATESDataTable + Private tableTBMT_TEMPLATES As TBMT_TEMPLATESDataTable _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) - Me.tableTBEDI_XML_TEMPLATES = CType(Me.Table,TBEDI_XML_TEMPLATESDataTable) + Me.tableTBMT_TEMPLATES = CType(Me.Table,TBMT_TEMPLATESDataTable) End Sub _ Public Property GUID() As Integer Get - Return CType(Me(Me.tableTBEDI_XML_TEMPLATES.GUIDColumn),Integer) + Return CType(Me(Me.tableTBMT_TEMPLATES.GUIDColumn),Integer) End Get Set - Me(Me.tableTBEDI_XML_TEMPLATES.GUIDColumn) = value + Me(Me.tableTBMT_TEMPLATES.GUIDColumn) = value End Set End Property @@ -2869,10 +2869,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property NAME() As String Get - Return CType(Me(Me.tableTBEDI_XML_TEMPLATES.NAMEColumn),String) + Return CType(Me(Me.tableTBMT_TEMPLATES.NAMEColumn),String) End Get Set - Me(Me.tableTBEDI_XML_TEMPLATES.NAMEColumn) = value + Me(Me.tableTBMT_TEMPLATES.NAMEColumn) = value End Set End Property @@ -2881,13 +2881,13 @@ Partial Public Class DS_DD_ECM Public Property DESCRIPTION() As String Get Try - Return CType(Me(Me.tableTBEDI_XML_TEMPLATES.DESCRIPTIONColumn),String) + Return CType(Me(Me.tableTBMT_TEMPLATES.DESCRIPTIONColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DESCRIPTION in Tabelle TBEDI_XML_TEMPLATES ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DESCRIPTION in Tabelle TBMT_TEMPLATES ist DBNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_TEMPLATES.DESCRIPTIONColumn) = value + Me(Me.tableTBMT_TEMPLATES.DESCRIPTIONColumn) = value End Set End Property @@ -2895,23 +2895,23 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TBEDI_XML_NODESRow() As TBEDI_XML_NODESRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES")),TBEDI_XML_NODESRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_NODES_TBMT_TEMPLATES")),TBEDI_XML_NODESRow) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES")) + Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_NODES_TBMT_TEMPLATES")) End Set End Property _ Public Function IsDESCRIPTIONNull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATES.DESCRIPTIONColumn) + Return Me.IsNull(Me.tableTBMT_TEMPLATES.DESCRIPTIONColumn) End Function _ Public Sub SetDESCRIPTIONNull() - Me(Me.tableTBEDI_XML_TEMPLATES.DESCRIPTIONColumn) = Global.System.Convert.DBNull + Me(Me.tableTBMT_TEMPLATES.DESCRIPTIONColumn) = Global.System.Convert.DBNull End Sub End Class @@ -2976,11 +2976,11 @@ Partial Public Class DS_DD_ECM _ - Public Function GetTBEDI_XML_TEMPLATESRows() As TBEDI_XML_TEMPLATESRow() - If (Me.Table.ChildRelations("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES") Is Nothing) Then - Return New TBEDI_XML_TEMPLATESRow(-1) {} + Public Function GetTBMT_TEMPLATESRows() As TBMT_TEMPLATESRow() + If (Me.Table.ChildRelations("TBEDI_XML_NODES_TBMT_TEMPLATES") Is Nothing) Then + Return New TBMT_TEMPLATESRow(-1) {} Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES")),TBEDI_XML_TEMPLATESRow()) + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_NODES_TBMT_TEMPLATES")),TBMT_TEMPLATESRow()) End If End Function End Class @@ -3354,16 +3354,16 @@ Partial Public Class DS_DD_ECM '''Row event argument class ''' _ - Public Class TBEDI_XML_TEMPLATESRowChangeEvent + Public Class TBMT_TEMPLATESRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBEDI_XML_TEMPLATESRow + Private eventRow As TBMT_TEMPLATESRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBEDI_XML_TEMPLATESRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBMT_TEMPLATESRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -3371,7 +3371,7 @@ Partial Public Class DS_DD_ECM _ - Public ReadOnly Property Row() As TBEDI_XML_TEMPLATESRow + Public ReadOnly Property Row() As TBMT_TEMPLATESRow Get Return Me.eventRow End Get @@ -4260,7 +4260,7 @@ Namespace DS_DD_ECMTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBEDI_XML_TEMPLATESTableAdapter + Partial Public Class TBMT_TEMPLATESTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -4377,31 +4377,31 @@ Namespace DS_DD_ECMTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBEDI_XML_TEMPLATES" + tableMapping.DataSetTable = "TBMT_TEMPLATES" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("NAME", "NAME") tableMapping.ColumnMappings.Add("DESCRIPTION", "DESCRIPTION") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TBEDI_XML_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NA"& _ - "ME] = @Original_NAME))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TBMT_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NAME] ="& _ + " @Original_NAME))" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TBEDI_XML_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @D"& _ - "ESCRIPTION);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUI"& _ - "D = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TBMT_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @DESCRI"& _ + "PTION);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = SCOPE_"& _ + "IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[TBEDI_XML_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTI"& _ - "ON WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID"& _ - ", NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[TBMT_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION WH"& _ + "ERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAM"& _ + "E, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -4423,7 +4423,7 @@ Namespace DS_DD_ECMTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, NAME, DESCRIPTION FROM dbo.TBEDI_XML_TEMPLATES" + Me._commandCollection(0).CommandText = "SELECT GUID, NAME, DESCRIPTION FROM dbo.TBMT_TEMPLATES" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -4431,7 +4431,7 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)> _ - Public Overloads Overridable Function Fill(ByVal dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATESDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DS_DD_ECM.TBMT_TEMPLATESDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -4444,9 +4444,9 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As DS_DD_ECM.TBEDI_XML_TEMPLATESDataTable + Public Overloads Overridable Function GetData() As DS_DD_ECM.TBMT_TEMPLATESDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATESDataTable = New DS_DD_ECM.TBEDI_XML_TEMPLATESDataTable() + Dim dataTable As DS_DD_ECM.TBMT_TEMPLATESDataTable = New DS_DD_ECM.TBMT_TEMPLATESDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -4454,7 +4454,7 @@ Namespace DS_DD_ECMTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATESDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DS_DD_ECM.TBMT_TEMPLATESDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -4462,7 +4462,7 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As DS_DD_ECM) As Integer - Return Me.Adapter.Update(dataSet, "TBEDI_XML_TEMPLATES") + Return Me.Adapter.Update(dataSet, "TBMT_TEMPLATES") End Function _ - Public Property TBEDI_XML_TEMPLATESTableAdapter() As TBEDI_XML_TEMPLATESTableAdapter + Public Property TBMT_TEMPLATESTableAdapter() As TBMT_TEMPLATESTableAdapter Get - Return Me._tBEDI_XML_TEMPLATESTableAdapter + Return Me._tBMT_TEMPLATESTableAdapter End Get Set - Me._tBEDI_XML_TEMPLATESTableAdapter = value + Me._tBMT_TEMPLATESTableAdapter = value End Set End Property @@ -5779,9 +5779,9 @@ Namespace DS_DD_ECMTableAdapters AndAlso (Not (Me._tBEDI_XML_TYPESTableAdapter.Connection) Is Nothing)) Then Return Me._tBEDI_XML_TYPESTableAdapter.Connection End If - If ((Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) _ - AndAlso (Not (Me._tBEDI_XML_TEMPLATESTableAdapter.Connection) Is Nothing)) Then - Return Me._tBEDI_XML_TEMPLATESTableAdapter.Connection + If ((Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBMT_TEMPLATESTableAdapter.Connection) Is Nothing)) Then + Return Me._tBMT_TEMPLATESTableAdapter.Connection End If If ((Not (Me._tBEDI_XML_NODESTableAdapter) Is Nothing) _ AndAlso (Not (Me._tBEDI_XML_NODESTableAdapter.Connection) Is Nothing)) Then @@ -5814,7 +5814,7 @@ Namespace DS_DD_ECMTableAdapters If (Not (Me._tBEDI_XML_TYPESTableAdapter) Is Nothing) Then count = (count + 1) End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then count = (count + 1) End If If (Not (Me._tBEDI_XML_NODESTableAdapter) Is Nothing) Then @@ -5864,12 +5864,12 @@ Namespace DS_DD_ECMTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBMT_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBEDI_XML_TEMPLATESTableAdapter.Update(updatedRows)) + result = (result + Me._tBMT_TEMPLATESTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -5925,11 +5925,11 @@ Namespace DS_DD_ECMTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBMT_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBEDI_XML_TEMPLATESTableAdapter.Update(addedRows)) + result = (result + Me._tBMT_TEMPLATESTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -5975,11 +5975,11 @@ Namespace DS_DD_ECMTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBMT_TEMPLATES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBEDI_XML_TEMPLATESTableAdapter.Update(deletedRows)) + result = (result + Me._tBMT_TEMPLATESTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -6058,8 +6058,8 @@ Namespace DS_DD_ECMTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If - If ((Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) _ - AndAlso (Me.MatchTableAdapterConnection(Me._tBEDI_XML_TEMPLATESTableAdapter.Connection) = false)) Then + If ((Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBMT_TEMPLATESTableAdapter.Connection) = false)) Then Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If @@ -6130,13 +6130,13 @@ Namespace DS_DD_ECMTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_TYPESTableAdapter.Adapter) End If End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then - revertConnections.Add(Me._tBEDI_XML_TEMPLATESTableAdapter, Me._tBEDI_XML_TEMPLATESTableAdapter.Connection) - Me._tBEDI_XML_TEMPLATESTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) - Me._tBEDI_XML_TEMPLATESTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) - If Me._tBEDI_XML_TEMPLATESTableAdapter.Adapter.AcceptChangesDuringUpdate Then - Me._tBEDI_XML_TEMPLATESTableAdapter.Adapter.AcceptChangesDuringUpdate = false - adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_TEMPLATESTableAdapter.Adapter) + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBMT_TEMPLATESTableAdapter, Me._tBMT_TEMPLATESTableAdapter.Connection) + Me._tBMT_TEMPLATESTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBMT_TEMPLATESTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBMT_TEMPLATESTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBMT_TEMPLATESTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBMT_TEMPLATESTableAdapter.Adapter) End If End If If (Not (Me._tBEDI_XML_NODESTableAdapter) Is Nothing) Then @@ -6234,9 +6234,9 @@ Namespace DS_DD_ECMTableAdapters Me._tBEDI_XML_TYPESTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_TYPESTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBEDI_XML_TYPESTableAdapter.Transaction = Nothing End If - If (Not (Me._tBEDI_XML_TEMPLATESTableAdapter) Is Nothing) Then - Me._tBEDI_XML_TEMPLATESTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_TEMPLATESTableAdapter),Global.System.Data.SqlClient.SqlConnection) - Me._tBEDI_XML_TEMPLATESTableAdapter.Transaction = Nothing + If (Not (Me._tBMT_TEMPLATESTableAdapter) Is Nothing) Then + Me._tBMT_TEMPLATESTableAdapter.Connection = CType(revertConnections(Me._tBMT_TEMPLATESTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBMT_TEMPLATESTableAdapter.Transaction = Nothing End If If (Not (Me._tBEDI_XML_NODESTableAdapter) Is Nothing) Then Me._tBEDI_XML_NODESTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_NODESTableAdapter),Global.System.Data.SqlClient.SqlConnection) diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd index ebbfb34..65189d6 100644 --- a/MultiTool.Form/DS_DD_ECM.xsd +++ b/MultiTool.Form/DS_DD_ECM.xsd @@ -144,12 +144,12 @@ SELECT GUID, NAME FROM TBEDI_XML_TYPES WHERE (GUID = @GUID) - + - + - DELETE FROM [dbo].[TBEDI_XML_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME)) + DELETE FROM [dbo].[TBMT_TEMPLATES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME)) @@ -158,8 +158,8 @@ SELECT GUID, NAME FROM TBEDI_XML_TYPES WHERE (GUID = @GUID) - INSERT INTO [dbo].[TBEDI_XML_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @DESCRIPTION); -SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [dbo].[TBMT_TEMPLATES] ([NAME], [DESCRIPTION]) VALUES (@NAME, @DESCRIPTION); +SELECT GUID, NAME, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = SCOPE_IDENTITY()) @@ -168,14 +168,14 @@ SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = SCOPE_IDEN - SELECT GUID, NAME, DESCRIPTION FROM dbo.TBEDI_XML_TEMPLATES + SELECT GUID, NAME, DESCRIPTION FROM dbo.TBMT_TEMPLATES - UPDATE [dbo].[TBEDI_XML_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME)); -SELECT GUID, NAME, DESCRIPTION FROM TBEDI_XML_TEMPLATES WHERE (GUID = @GUID) + UPDATE [dbo].[TBMT_TEMPLATES] SET [NAME] = @NAME, [DESCRIPTION] = @DESCRIPTION WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME)); +SELECT GUID, NAME, DESCRIPTION FROM TBMT_TEMPLATES WHERE (GUID = @GUID) @@ -440,7 +440,7 @@ WHERE (GUID = @Original_GUID) - + @@ -561,8 +561,8 @@ WHERE (GUID = @Original_GUID) - - + + @@ -582,7 +582,7 @@ WHERE (GUID = @Original_GUID) - + \ No newline at end of file diff --git a/MultiTool.Form/DS_DD_ECM.xss b/MultiTool.Form/DS_DD_ECM.xss index d52ebd0..b700cee 100644 --- a/MultiTool.Form/DS_DD_ECM.xss +++ b/MultiTool.Form/DS_DD_ECM.xss @@ -8,7 +8,7 @@ - + @@ -42,7 +42,7 @@ - + 770 diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index 57cca4e..ed741f6 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -419,7 +419,7 @@ Partial Class frmConfig Me.TableAdapterManager.TBMT_FUNCTIONSTableAdapter = Nothing Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing Me.TableAdapterManager.TBMT_TEMPLATE_ITEMSTableAdapter = Me.TBMT_TEMPLATE_ITEMSTableAdapter - Me.TableAdapterManager.TBEDI_XML_TEMPLATESTableAdapter = Nothing + Me.TableAdapterManager.TBMT_TEMPLATESTableAdapter = Nothing Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' diff --git a/MultiTool.Shared/Templates/TemplateLoader.vb b/MultiTool.Shared/Templates/TemplateLoader.vb index 7a5f2ff..35be603 100644 --- a/MultiTool.Shared/Templates/TemplateLoader.vb +++ b/MultiTool.Shared/Templates/TemplateLoader.vb @@ -20,7 +20,7 @@ Namespace Templates Private Const SQL_VWEDI_XML_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWEDI_XML_MAPPING]" Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY" Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]" - Private Const SQL_TBEDI_XML_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_TEMPLATES]" + Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES]" Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer) MyBase.New(pLogConfig) @@ -29,7 +29,7 @@ Namespace Templates Public Async Function LoadTemplates() As Task(Of Boolean) Try - Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBEDI_XML_TEMPLATES) + Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_TEMPLATES) Dim oTemplates As New List(Of Template) For Each oRow As DataRow In oTable.Rows