diff --git a/MultiTool.Form/CREATE_DATABASE.sql b/MultiTool.Form/CREATE_DATABASE.sql index f6d9d68..99db8d6 100644 --- a/MultiTool.Form/CREATE_DATABASE.sql +++ b/MultiTool.Form/CREATE_DATABASE.sql @@ -1,8 +1,8 @@ USE [DD_ECM] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES] GO ALTER TABLE [dbo].[TBEDI_XML_TYPES] DROP CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN] GO @@ -40,21 +40,21 @@ ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_VALUE GO ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] DROP CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHEN] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHO] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ACTIVE] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ACTIVE] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VIRTUAL] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_VIRTUAL] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_REQUIRED] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_VISIBLE] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_READ_ONLY] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ORDER_KEY] GO ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] DROP CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN] GO @@ -92,9 +92,9 @@ GO IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MANDATORS]') AND type in (N'U')) DROP TABLE [dbo].[TBEDI_XML_MANDATORS] GO -/****** Object: Table [dbo].[TBEDI_XML_ITEMS] Script Date: 26.11.2021 16:07:58 ******/ -IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_ITEMS]') AND type in (N'U')) -DROP TABLE [dbo].[TBEDI_XML_ITEMS] +/****** Object: Table [dbo].[TBEDI_XML_TEMPLATE_ITEMS] Script Date: 26.11.2021 16:07:58 ******/ +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATE_ITEMS]') AND type in (N'U')) +DROP TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] GO /****** Object: Table [dbo].[TBEDI_XML_FUNCTIONS] Script Date: 26.11.2021 16:07:58 ******/ IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_FUNCTIONS]') AND type in (N'U')) @@ -147,12 +147,12 @@ CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS]( )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_ITEMS] Script Date: 26.11.2021 16:07:58 ******/ +/****** Object: Table [dbo].[TBEDI_XML_TEMPLATE_ITEMS] Script Date: 26.11.2021 16:07:58 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO -CREATE TABLE [dbo].[TBEDI_XML_ITEMS]( +CREATE TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS]( [GUID] [int] IDENTITY(1,1) NOT NULL, [ORDER_KEY] [int] NOT NULL, [XML_NAME] [nvarchar](50) NOT NULL, @@ -339,73 +339,73 @@ INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS], GO SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] OFF GO -SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] ON +SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ON GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, 0, N'BELEGKEY', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, 0, N'BELEGKEY', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 0, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, 0, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 0, N'Laufnummer', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (3, 0, N'Laufnummer', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, 0, N'Bestellt_von', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (4, 0, N'Bestellt_von', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 0, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (5, 0, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 0, 1, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 0, N'Lief_Name', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (6, 0, N'Lief_Name', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 0, N'Lief_Strasse', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (7, 0, N'Lief_Strasse', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 0, N'Lief_PLZ', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (8, 0, N'Lief_PLZ', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (9, 0, N'Lief_Ort', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (9, 0, N'Lief_Ort', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, 0, N'Belegart', 1, 2, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-23T13:26:49.413' AS DateTime)) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (10, 0, N'Belegart', 1, 2, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, CAST(N'2021-11-23T13:26:49.413' AS DateTime)) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 0, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (11, 0, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 0, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (12, 0, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 0, N'Leistungsdatum', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (13, 0, N'Leistungsdatum', 1, 3, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (14, 0, N'Infotext', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (14, 0, N'Infotext', 1, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 0, N'BELEGKEY', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (15, 0, N'BELEGKEY', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 1, N'Zeilennummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (16, 1, N'Zeilennummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 0, N'Datentyp', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (17, 0, N'Datentyp', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (18, 2, N'Artikelnummer', 2, 1, 0, 1, 0, 0, 2, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (18, 2, N'Artikelnummer', 2, 1, 0, 1, 0, 0, 2, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 3, N'Bezeichnung', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (19, 3, N'Bezeichnung', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 0, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (20, 0, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 0, N'Menge_bestellt', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (21, 0, N'Menge_bestellt', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 0, N'Menge_geliefert', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (22, 0, N'Menge_geliefert', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 0, N'Colli', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (23, 0, N'Colli', 2, 1, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 0, N'Einzelpreis', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (24, 0, N'Einzelpreis', 2, 5, 0, 1, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 0, N'Zeilenrabatt1', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (25, 0, N'Zeilenrabatt1', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 0, N'Zeilenrabatt2', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (26, 0, N'Zeilenrabatt2', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 0, N'Zeilenrabatt3', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (27, 0, N'Zeilenrabatt3', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 0, N'Zeilenrabatt4', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (28, 0, N'Zeilenrabatt4', 2, 5, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 0, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (29, 0, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 0, N'EDI_Infotext', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (30, 0, N'EDI_Infotext', 2, 1, 0, 0, 0, 0, NULL, NULL, 1, NULL, N'DEFAULT', NULL, NULL, NULL) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (31, 0, N'Lagerstand', 2, 1, 0, 0, 0, 1, 3, N'SELECT (c008 - c009) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T14:00:35.573' AS DateTime), NULL, CAST(N'2021-11-23T16:05:09.667' AS DateTime)) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (31, 0, N'Lagerstand', 2, 1, 0, 0, 0, 1, 3, N'SELECT (c008 - c009) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T14:00:35.573' AS DateTime), NULL, CAST(N'2021-11-23T16:05:09.667' AS DateTime)) GO -INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (32, 0, N'EinheitProPalette', 2, 1, 0, 0, 0, 1, 3, N'SELECT TRY_CONVERT(float, ISNULL(c208, 0)) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T15:41:26.263' AS DateTime), NULL, CAST(N'2021-11-23T15:42:23.123' AS DateTime)) +INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (32, 0, N'EinheitProPalette', 2, 1, 0, 0, 0, 1, 3, N'SELECT TRY_CONVERT(float, ISNULL(c208, 0)) FROM [CWLDATEN_SIVT].[dbo].[v021] WHERE c002 = ''{#FIELD#Artikelnummer}'' AND MESOCOMP = ''{#CONST#MESOCOMP}'' AND MESOYEAR = {#CONST#MESOYEAR}', 1, NULL, N'DEFAULT', CAST(N'2021-11-23T15:41:26.263' AS DateTime), NULL, CAST(N'2021-11-23T15:42:23.123' AS DateTime)) GO -SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] OFF +SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] OFF GO SET IDENTITY_INSERT [dbo].[TBEDI_XML_MANDATORS] ON GO @@ -521,21 +521,21 @@ ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ GO ALTER TABLE [dbo].[TBEDI_XML_FUNCTIONS] ADD CONSTRAINT [DF_TBEDI_XML_FUNCTIONS_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY] DEFAULT ((0)) FOR [ORDER_KEY] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ORDER_KEY] DEFAULT ((0)) FOR [ORDER_KEY] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY] DEFAULT ((0)) FOR [IS_READ_ONLY] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_READ_ONLY] DEFAULT ((0)) FOR [IS_READ_ONLY] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE] DEFAULT ((0)) FOR [IS_VISIBLE] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_VISIBLE] DEFAULT ((0)) FOR [IS_VISIBLE] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED] DEFAULT ((0)) FOR [IS_REQUIRED] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_REQUIRED] DEFAULT ((0)) FOR [IS_REQUIRED] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VIRTUAL] DEFAULT ((0)) FOR [IS_VIRTUAL] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_IS_VIRTUAL] DEFAULT ((0)) FOR [IS_VIRTUAL] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHO] DEFAULT (N'DEFAULT') FOR [ADDED_WHO] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHO] DEFAULT (N'DEFAULT') FOR [ADDED_WHO] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_ITEMS_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] GO ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] ADD CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE] DEFAULT ((1)) FOR [ACTIVE] GO @@ -573,13 +573,13 @@ ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WH GO ALTER TABLE [dbo].[TBEDI_XML_TYPES] ADD CONSTRAINT [DF_TBEDI_XML_TYPES_ADDED_WHEN] DEFAULT (getdate()) FOR [ADDED_WHEN] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] WITH CHECK ADD CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID]) -REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID]) +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] WITH CHECK ADD CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID]) +REFERENCES [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID]) GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_NODES] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_NODES] GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] WITH CHECK ADD CONSTRAINT [FK_TBEDI_XML_TYPES] FOREIGN KEY([XML_TYPE_ID]) -REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID]) +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] WITH CHECK ADD CONSTRAINT [FK_TBEDI_XML_TYPES] FOREIGN KEY([XML_TYPE_ID]) +REFERENCES [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID]) GO -ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_TYPES] +ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_TYPES] GO diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb index 87fbfd2..de9df58 100644 --- a/MultiTool.Form/DS_DD_ECM.Designer.vb +++ b/MultiTool.Form/DS_DD_ECM.Designer.vb @@ -37,16 +37,12 @@ Partial Public Class DS_DD_ECM Private tableTBEDI_XML_CONFIG As TBEDI_XML_CONFIGDataTable - Private relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS As Global.System.Data.DataRelation + Private relationTBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_FUNCTIONS As Global.System.Data.DataRelation - Private relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES As Global.System.Data.DataRelation + Private relationTBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_TYPES As Global.System.Data.DataRelation Private relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES As Global.System.Data.DataRelation - Private relationFK_TBEDI_XML_TYPES As Global.System.Data.DataRelation - - Private relationFK_TBEDI_XML_NODES As Global.System.Data.DataRelation - Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ - Public Overloads Function AddTBEDI_XML_TEMPLATE_ITEMSRow(ByVal XML_NAME As String, ByVal parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_TYPES As TBEDI_XML_TEMPLATE_ITEMSRow, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Integer, ByVal IS_REQUIRED As Boolean, ByVal parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES As TBEDI_XML_TEMPLATE_ITEMSRow, ByVal IS_VIRTUAL As Boolean, ByVal FUNCTION_PARAMETERS As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBEDI_XML_TEMPLATE_ITEMSRow + Public Overloads Function AddTBEDI_XML_TEMPLATE_ITEMSRow(ByVal XML_NAME As String, ByVal XML_TYPE_ID As Integer, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Integer, ByVal IS_REQUIRED As Boolean, ByVal XML_TABLE_ID As Integer, ByVal IS_VIRTUAL As Boolean, ByVal FUNCTION_PARAMETERS As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBEDI_XML_TEMPLATE_ITEMSRow Dim rowTBEDI_XML_TEMPLATE_ITEMSRow As TBEDI_XML_TEMPLATE_ITEMSRow = CType(Me.NewRow,TBEDI_XML_TEMPLATE_ITEMSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, Nothing, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, Nothing, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} - If (Not (parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_TYPES) Is Nothing) Then - columnValuesArray(2) = parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_TYPES(0) - End If - If (Not (parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES) Is Nothing) Then - columnValuesArray(8) = parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES(0) - End If + Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, XML_TABLE_ID, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} rowTBEDI_XML_TEMPLATE_ITEMSRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBEDI_XML_TEMPLATE_ITEMSRow) Return rowTBEDI_XML_TEMPLATE_ITEMSRow @@ -2154,6 +2138,12 @@ Partial Public Class DS_DD_ECM Private columnCHANGED_WHEN As Global.System.Data.DataColumn + Private columnACTIVE As Global.System.Data.DataColumn + + Private columnTEMPLATE_ID As Global.System.Data.DataColumn + + Private columnCOMMENT As Global.System.Data.DataColumn + _ Public Sub New() @@ -2245,6 +2235,30 @@ Partial Public Class DS_DD_ECM End Get End Property + _ + Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnACTIVE + End Get + End Property + + _ + Public ReadOnly Property TEMPLATE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTEMPLATE_ID + End Get + End Property + + _ + Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOMMENT + End Get + End Property + _ @@ -2282,14 +2296,20 @@ Partial Public Class DS_DD_ECM _ - Public Overloads Function AddTBEDI_XML_CONFIGRow(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBEDI_XML_CONFIGRow + Public Overloads Function AddTBEDI_XML_CONFIGRow(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal ACTIVE As Boolean, ByVal TEMPLATE_ID As Integer, ByVal COMMENT As String) As TBEDI_XML_CONFIGRow Dim rowTBEDI_XML_CONFIGRow As TBEDI_XML_CONFIGRow = CType(Me.NewRow,TBEDI_XML_CONFIGRow) - Dim columnValuesArray() As Object = New Object() {Nothing, KEY, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, KEY, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT} rowTBEDI_XML_CONFIGRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBEDI_XML_CONFIGRow) Return rowTBEDI_XML_CONFIGRow End Function + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBEDI_XML_CONFIGRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBEDI_XML_CONFIGRow) + End Function + _ Public Overrides Function Clone() As Global.System.Data.DataTable @@ -2314,6 +2334,9 @@ Partial Public Class DS_DD_ECM Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnACTIVE = MyBase.Columns("ACTIVE") + Me.columnTEMPLATE_ID = MyBase.Columns("TEMPLATE_ID") + Me.columnCOMMENT = MyBase.Columns("COMMENT") End Sub _ - Public Property TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_TYPES() As TBEDI_XML_TEMPLATE_ITEMSRow - Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow) - End Get - Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_TYPES")) - End Set - End Property - - _ - Public Property TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_NODES() As TBEDI_XML_TEMPLATE_ITEMSRow - Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_TEMPLATE_ITEMSRow) - End Get - Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_NODES")) - End Set - End Property - _ Public Function IsFUNCTION_IDNull() As Boolean @@ -2760,40 +2771,20 @@ Partial Public Class DS_DD_ECM _ Public Function GetTBEDI_XML_FUNCTIONSRows() As TBEDI_XML_FUNCTIONSRow() - If (Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS") Is Nothing) Then + If (Me.Table.ChildRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_FUNCTIONS") Is Nothing) Then Return New TBEDI_XML_FUNCTIONSRow(-1) {} Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_FUNCTIONSRow()) + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_FUNCTIONSRow()) End If End Function _ Public Function GetTBEDI_XML_TYPESRows() As TBEDI_XML_TYPESRow() - If (Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES") Is Nothing) Then + If (Me.Table.ChildRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_TYPES") Is Nothing) Then Return New TBEDI_XML_TYPESRow(-1) {} Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_TYPESRow()) - End If - End Function - - _ - Public Function GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_TYPES() As TBEDI_XML_TEMPLATE_ITEMSRow() - If (Me.Table.ChildRelations("FK_TBEDI_XML_TYPES") Is Nothing) Then - Return New TBEDI_XML_TEMPLATE_ITEMSRow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow()) - End If - End Function - - _ - Public Function GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_NODES() As TBEDI_XML_TEMPLATE_ITEMSRow() - If (Me.Table.ChildRelations("FK_TBEDI_XML_NODES") Is Nothing) Then - Return New TBEDI_XML_TEMPLATE_ITEMSRow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_TEMPLATE_ITEMSRow()) + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_TYPESRow()) End If End Function End Class @@ -2837,12 +2828,12 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow + Public Property TBEDI_XML_TEMPLATE_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")) + Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_TYPES")) End Set End Property End Class @@ -3058,12 +3049,12 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow + Public Property TBEDI_XML_TEMPLATE_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_TEMPLATE_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")) + Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_TEMPLATE_ITEMS_TBEDI_XML_FUNCTIONS")) End Set End Property @@ -3184,6 +3175,47 @@ Partial Public Class DS_DD_ECM End Set End Property + _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBEDI_XML_CONFIG.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.ACTIVEColumn) = value + End Set + End Property + + _ + Public Property TEMPLATE_ID() As Integer + Get + Try + Return CType(Me(Me.tableTBEDI_XML_CONFIG.TEMPLATE_IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TEMPLATE_ID in Tabelle TBEDI_XML_CONFIG ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.TEMPLATE_IDColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBEDI_XML_CONFIG.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBEDI_XML_CONFIG ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.COMMENTColumn) = value + End Set + End Property + _ Public Function IsADDED_WHENNull() As Boolean @@ -3219,6 +3251,30 @@ Partial Public Class DS_DD_ECM Public Sub SetCHANGED_WHENNull() Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function IsTEMPLATE_IDNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_CONFIG.TEMPLATE_IDColumn) + End Function + + _ + Public Sub SetTEMPLATE_IDNull() + Me(Me.tableTBEDI_XML_CONFIG.TEMPLATE_IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_CONFIG.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBEDI_XML_CONFIG.COMMENTColumn) = Global.System.Convert.DBNull + End Sub End Class ''' @@ -3585,20 +3641,20 @@ Namespace DS_DD_ECMTableAdapters 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 TBEDI_XML_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBEDI_XML_TEMPLATE_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" 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, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", 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 [TBEDI_XML_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE"& _ - "_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], "& _ - "[FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN])"& _ - " VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_"& _ - "VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_W"& _ - "HO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY, XML_NAME"& _ - ", XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, "& _ - "FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ - "EN FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBEDI_XML_TEMPLATE_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], "& _ + "[XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCT"& _ + "ION_ID], [FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANG"& _ + "ED_WHEN]) VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_O"& _ + "NLY, @IS_VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS,"& _ + " @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY,"& _ + " XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_"& _ + "VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C"& _ + "HANGED_WHEN FROM TBEDI_XML_TEMPLATE_ITEMS WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NAME", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -3616,16 +3672,16 @@ Namespace DS_DD_ECMTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", 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 TBEDI_XML_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET ORDER_KEY = @ORDER_KEY, XML_NAME"& _ - " = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_"& _ - "ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" IS_RE"& _ - "QUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUN"& _ - "CTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @A"& _ - "DDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN ="& _ - " @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY, "& _ - "XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_V"& _ - "IRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CH"& _ - "ANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBEDI_XML_TEMPLATE_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET ORDER_KEY = @ORDER_KEY,"& _ + " XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID,"& _ + " IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTIO"& _ + "N_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_"& _ + "WHEN = @ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO = @CHANGED_WHO, CHANG"& _ + "ED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, OR"& _ + "DER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUI"& _ + "RED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGE"& _ + "D_WHO, CHANGED_WHEN FROM TBEDI_XML_TEMPLATE_ITEMS WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NAME", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -3658,7 +3714,8 @@ 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 TBEDI_XML_ITEMS.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_ITEMS" + Me._commandCollection(0).CommandText = "SELECT TBEDI_XML_TEMPLATE_ITEMS.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_TEMPLATE_ITEM"& _ + "S" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -5312,6 +5369,9 @@ Namespace DS_DD_ECMTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("TEMPLATE_ID", "TEMPLATE_ID") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -5320,21 +5380,26 @@ Namespace DS_DD_ECMTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", 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 [TBEDI_XML_CONFIG] ([KEY], [VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANG"& _ - "ED_WHO], [CHANGED_WHEN]) VALUES (@KEY, @VALUE, @ADDED_WHO, @ADDED_WHEN, @CHANGED"& _ - "_WHO, @CHANGED_WHEN)" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBEDI_XML_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ([KEY], VALUE, ADDED_WHO, "& _ + "ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ + " (@KEY,@VALUE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@ACTIVE,@TEMP"& _ + "LATE_ID,@COMMENT)" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@KEY", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@KEY", Global.System.Data.SqlDbType.NVarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.NVarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.NVarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", 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 TBEDI_XML_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET [KEY] = @KEY, VALUE = @VALUE, A"& _ "DDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHA"& _ - "NGED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + "NGED_WHEN = @CHANGED_WHEN, ACTIVE = @ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TEMPLATE"& _ + "_ID = @TEMPLATE_ID, COMMENT = @COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@KEY", Global.System.Data.SqlDbType.NVarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.NVarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -5342,6 +5407,9 @@ Namespace DS_DD_ECMTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.NVarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -5359,7 +5427,7 @@ Namespace DS_DD_ECMTableAdapters Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ - "N"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_CONFIG" + "N, ACTIVE, TEMPLATE_ID, COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_CONFIG" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -5440,7 +5508,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.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Public Overloads Overridable Function Insert(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal ACTIVE As Boolean, ByVal TEMPLATE_ID As Global.System.Nullable(Of Integer), ByVal COMMENT As String) As Integer If (KEY Is Nothing) Then Throw New Global.System.ArgumentNullException("KEY") Else @@ -5471,6 +5539,17 @@ Namespace DS_DD_ECMTableAdapters Else Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value End If + Me.Adapter.InsertCommand.Parameters(6).Value = CType(ACTIVE,Boolean) + If (TEMPLATE_ID.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(7).Value = CType(TEMPLATE_ID.Value,Integer) + Else + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(8).Value = CType(COMMENT,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -5490,7 +5569,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.Update, true)> _ - Public Overloads Overridable Function Update(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal ACTIVE As Boolean, ByVal TEMPLATE_ID As Global.System.Nullable(Of Integer), ByVal COMMENT As String, ByVal Original_GUID As Integer) As Integer If (KEY Is Nothing) Then Throw New Global.System.ArgumentNullException("KEY") Else @@ -5521,7 +5600,18 @@ Namespace DS_DD_ECMTableAdapters Else Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value End If - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ACTIVE,Boolean) + If (TEMPLATE_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(TEMPLATE_ID.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(COMMENT,String) + End If + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -5752,9 +5842,6 @@ Namespace DS_DD_ECMTableAdapters updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - Me.SortSelfReferenceRows(updatedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), false) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. - Me.SortSelfReferenceRows(updatedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If @@ -5818,9 +5905,6 @@ Namespace DS_DD_ECMTableAdapters Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATE_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - Me.SortSelfReferenceRows(addedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), false) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. - Me.SortSelfReferenceRows(addedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If @@ -5919,9 +6003,6 @@ Namespace DS_DD_ECMTableAdapters Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATE_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - Me.SortSelfReferenceRows(deletedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), true) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. - Me.SortSelfReferenceRows(deletedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), true) result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd index c781a82..d5dfa5e 100644 --- a/MultiTool.Form/DS_DD_ECM.xsd +++ b/MultiTool.Form/DS_DD_ECM.xsd @@ -9,20 +9,20 @@ - + - DELETE FROM TBEDI_XML_ITEMS + DELETE FROM TBEDI_XML_TEMPLATE_ITEMS WHERE (GUID = @Original_GUID) - + - INSERT INTO [TBEDI_XML_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); -SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBEDI_XML_TEMPLATE_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); +SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_TEMPLATE_ITEMS WHERE (GUID = SCOPE_IDENTITY()) @@ -43,36 +43,36 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI - SELECT TBEDI_XML_ITEMS.* -FROM TBEDI_XML_ITEMS + SELECT TBEDI_XML_TEMPLATE_ITEMS.* +FROM TBEDI_XML_TEMPLATE_ITEMS - UPDATE TBEDI_XML_ITEMS + UPDATE TBEDI_XML_TEMPLATE_ITEMS SET ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN WHERE (GUID = @Original_GUID); -SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID) +SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_TEMPLATE_ITEMS WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -313,21 +313,26 @@ WHERE (GUID = @Original_GUID) - - INSERT INTO [TBEDI_XML_CONFIG] ([KEY], [VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@KEY, @VALUE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN) + + INSERT INTO TBEDI_XML_CONFIG + ([KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT) +VALUES (@KEY,@VALUE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@ACTIVE,@TEMPLATE_ID,@COMMENT) - - - - - - + + + + + + + + + - SELECT GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + SELECT GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, TEMPLATE_ID, COMMENT FROM TBEDI_XML_CONFIG @@ -335,7 +340,8 @@ FROM TBEDI_XML_CONFIG UPDATE TBEDI_XML_CONFIG -SET [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN +SET [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, ACTIVE = @ACTIVE, + TEMPLATE_ID = @TEMPLATE_ID, COMMENT = @COMMENT WHERE (GUID = @Original_GUID) @@ -344,6 +350,9 @@ WHERE (GUID = @Original_GUID) + + + @@ -358,6 +367,9 @@ WHERE (GUID = @Original_GUID) + + + @@ -369,7 +381,7 @@ WHERE (GUID = @Original_GUID) - + @@ -414,7 +426,7 @@ WHERE (GUID = @Original_GUID) - + @@ -428,7 +440,7 @@ WHERE (GUID = @Original_GUID) - + @@ -449,7 +461,7 @@ WHERE (GUID = @Original_GUID) - + @@ -465,7 +477,7 @@ WHERE (GUID = @Original_GUID) - + @@ -493,7 +505,7 @@ WHERE (GUID = @Original_GUID) - + @@ -527,6 +539,15 @@ WHERE (GUID = @Original_GUID) + + + + + + + + + @@ -552,14 +573,16 @@ 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 beba0f0..69e6044 100644 --- a/MultiTool.Form/DS_DD_ECM.xss +++ b/MultiTool.Form/DS_DD_ECM.xss @@ -7,14 +7,14 @@ - - - - - + + + + + - + 240 @@ -30,7 +30,7 @@ - + 257 @@ -42,7 +42,7 @@ - + 770 @@ -54,53 +54,5 @@ - - - - 5 - 33 - - - -33 - 33 - - - -33 - -30 - - - 30 - -30 - - - 30 - 8 - - - - - - - 5 - 41 - - - -41 - 41 - - - -41 - -38 - - - 38 - -38 - - - 38 - 8 - - - \ No newline at end of file diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 7f286a0..27ee0f2 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -102,6 +102,9 @@ ..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + + ..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index 7b01b94..75bcdce 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -31,7 +31,22 @@ Partial Class frmConfig Me.TBEDIXMLITEMSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DS_DD_ECM = New MultiTool.Form.DS_DD_ECM() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_NAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_TYPE_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_VISIBLE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colORDER_KEY = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_REQUIRED = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_VIRTUAL = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colFUNCTION_PARAMETERS = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_TABLE_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.tabPageConfig = New DevExpress.XtraTab.XtraTabPage() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.TBEDI_XML_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -42,6 +57,9 @@ Partial Class frmConfig Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCHANGED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCOMMENT = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colACTIVE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colTEMPLATE_ID = New DevExpress.XtraGrid.Columns.GridColumn() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -51,21 +69,6 @@ Partial Class frmConfig Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBEDI_XML_TEMPLATE_ITEMSTableAdapter() Me.TBEDI_XML_CONFIGTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBEDI_XML_CONFIGTableAdapter() Me.TableAdapterManager = New MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager() - Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_NAME = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_TYPE_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_VISIBLE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colORDER_KEY = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_REQUIRED = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_TABLE_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_VIRTUAL = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colFUNCTION_PARAMETERS = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colADDED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colADDED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colCHANGED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colCHANGED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.tabPageSchema.SuspendLayout() @@ -73,7 +76,7 @@ Partial Class frmConfig CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabPage1.SuspendLayout() + Me.tabPageConfig.SuspendLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBEDI_XML_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -88,7 +91,7 @@ Partial Class frmConfig Me.XtraTabControl1.SelectedTabPage = Me.tabPageSchema Me.XtraTabControl1.Size = New System.Drawing.Size(1093, 571) Me.XtraTabControl1.TabIndex = 1 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSchema, Me.XtraTabPage1}) + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSchema, Me.tabPageConfig}) ' 'tabPageSchema ' @@ -110,7 +113,7 @@ Partial Class frmConfig ' 'TBEDIXMLITEMSBindingSource ' - Me.TBEDIXMLITEMSBindingSource.DataMember = "TBEDI_XML_ITEMS" + Me.TBEDIXMLITEMSBindingSource.DataMember = "TBEDI_XML_TEMPLATE_ITEMS" Me.TBEDIXMLITEMSBindingSource.DataSource = Me.DS_DD_ECM ' 'DS_DD_ECM @@ -120,16 +123,133 @@ Partial Class frmConfig ' 'GridView1 ' - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colFUNCTION_ID, Me.colIS_REQUIRED, Me.colXML_TABLE_ID, Me.colIS_VIRTUAL, Me.colFUNCTION_PARAMETERS, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1}) + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colIS_REQUIRED, Me.colIS_VIRTUAL, Me.colFUNCTION_ID, Me.colFUNCTION_PARAMETERS, Me.colXML_TABLE_ID, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" ' - 'XtraTabPage1 + 'colGUID ' - Me.XtraTabPage1.Controls.Add(Me.GridControl2) - Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1091, 546) - Me.XtraTabPage1.Text = "XtraTabPage1" + Me.colGUID.FieldName = "GUID" + Me.colGUID.Name = "colGUID" + ' + 'colXML_NAME + ' + Me.colXML_NAME.Caption = "Name" + Me.colXML_NAME.FieldName = "XML_NAME" + Me.colXML_NAME.MaxWidth = 120 + Me.colXML_NAME.MinWidth = 100 + Me.colXML_NAME.Name = "colXML_NAME" + Me.colXML_NAME.Visible = True + Me.colXML_NAME.VisibleIndex = 0 + Me.colXML_NAME.Width = 123 + ' + 'colXML_TYPE_ID + ' + Me.colXML_TYPE_ID.Caption = "Typ" + Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" + Me.colXML_TYPE_ID.MaxWidth = 80 + Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" + Me.colXML_TYPE_ID.Visible = True + Me.colXML_TYPE_ID.VisibleIndex = 1 + Me.colXML_TYPE_ID.Width = 30 + ' + 'colIS_READ_ONLY + ' + Me.colIS_READ_ONLY.Caption = "Read Only" + Me.colIS_READ_ONLY.FieldName = "IS_READ_ONLY" + Me.colIS_READ_ONLY.MaxWidth = 80 + Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY" + Me.colIS_READ_ONLY.Visible = True + Me.colIS_READ_ONLY.VisibleIndex = 2 + Me.colIS_READ_ONLY.Width = 50 + ' + 'colIS_VISIBLE + ' + Me.colIS_VISIBLE.Caption = "Sichtbar" + Me.colIS_VISIBLE.FieldName = "IS_VISIBLE" + Me.colIS_VISIBLE.MaxWidth = 80 + Me.colIS_VISIBLE.Name = "colIS_VISIBLE" + Me.colIS_VISIBLE.Visible = True + Me.colIS_VISIBLE.VisibleIndex = 3 + ' + 'colORDER_KEY + ' + Me.colORDER_KEY.Caption = "Sortierung" + Me.colORDER_KEY.FieldName = "ORDER_KEY" + Me.colORDER_KEY.MaxWidth = 80 + Me.colORDER_KEY.Name = "colORDER_KEY" + Me.colORDER_KEY.Visible = True + Me.colORDER_KEY.VisibleIndex = 6 + Me.colORDER_KEY.Width = 50 + ' + 'colIS_REQUIRED + ' + Me.colIS_REQUIRED.Caption = "Pflichtfeld" + Me.colIS_REQUIRED.FieldName = "IS_REQUIRED" + Me.colIS_REQUIRED.MaxWidth = 80 + Me.colIS_REQUIRED.Name = "colIS_REQUIRED" + Me.colIS_REQUIRED.Visible = True + Me.colIS_REQUIRED.VisibleIndex = 4 + Me.colIS_REQUIRED.Width = 50 + ' + 'colIS_VIRTUAL + ' + Me.colIS_VIRTUAL.Caption = "Virtuell" + Me.colIS_VIRTUAL.FieldName = "IS_VIRTUAL" + Me.colIS_VIRTUAL.MaxWidth = 80 + Me.colIS_VIRTUAL.Name = "colIS_VIRTUAL" + Me.colIS_VIRTUAL.Visible = True + Me.colIS_VIRTUAL.VisibleIndex = 5 + ' + 'colFUNCTION_ID + ' + Me.colFUNCTION_ID.Caption = "Funktion" + Me.colFUNCTION_ID.FieldName = "FUNCTION_ID" + Me.colFUNCTION_ID.MaxWidth = 80 + Me.colFUNCTION_ID.Name = "colFUNCTION_ID" + Me.colFUNCTION_ID.Visible = True + Me.colFUNCTION_ID.VisibleIndex = 7 + Me.colFUNCTION_ID.Width = 50 + ' + 'colFUNCTION_PARAMETERS + ' + Me.colFUNCTION_PARAMETERS.Caption = "Funktionsparameter" + Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS" + Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS" + Me.colFUNCTION_PARAMETERS.Visible = True + Me.colFUNCTION_PARAMETERS.VisibleIndex = 8 + ' + 'colXML_TABLE_ID + ' + Me.colXML_TABLE_ID.FieldName = "XML_TABLE_ID" + Me.colXML_TABLE_ID.Name = "colXML_TABLE_ID" + ' + 'colADDED_WHO1 + ' + Me.colADDED_WHO1.FieldName = "ADDED_WHO" + Me.colADDED_WHO1.Name = "colADDED_WHO1" + ' + 'colADDED_WHEN1 + ' + Me.colADDED_WHEN1.FieldName = "ADDED_WHEN" + Me.colADDED_WHEN1.Name = "colADDED_WHEN1" + ' + 'colCHANGED_WHO1 + ' + Me.colCHANGED_WHO1.FieldName = "CHANGED_WHO" + Me.colCHANGED_WHO1.Name = "colCHANGED_WHO1" + ' + 'colCHANGED_WHEN1 + ' + Me.colCHANGED_WHEN1.FieldName = "CHANGED_WHEN" + Me.colCHANGED_WHEN1.Name = "colCHANGED_WHEN1" + ' + 'tabPageConfig + ' + Me.tabPageConfig.Controls.Add(Me.GridControl2) + Me.tabPageConfig.Name = "tabPageConfig" + Me.tabPageConfig.Size = New System.Drawing.Size(1091, 546) + Me.tabPageConfig.Text = "Konfiguration" ' 'GridControl2 ' @@ -150,7 +270,7 @@ Partial Class frmConfig ' 'GridView2 ' - Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID1, Me.colKEY, Me.colVALUE, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN}) + Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID1, Me.colKEY, Me.colVALUE, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN, Me.colCOMMENT, Me.colACTIVE, Me.colTEMPLATE_ID}) Me.GridView2.GridControl = Me.GridControl2 Me.GridView2.Name = "GridView2" ' @@ -158,50 +278,66 @@ Partial Class frmConfig ' Me.colGUID1.FieldName = "GUID" Me.colGUID1.Name = "colGUID1" - Me.colGUID1.Visible = True - Me.colGUID1.VisibleIndex = 0 ' 'colKEY ' + Me.colKEY.Caption = "Beschreibung" Me.colKEY.FieldName = "KEY" Me.colKEY.Name = "colKEY" Me.colKEY.Visible = True - Me.colKEY.VisibleIndex = 1 + Me.colKEY.VisibleIndex = 0 ' 'colVALUE ' + Me.colVALUE.Caption = "Wert" Me.colVALUE.FieldName = "VALUE" Me.colVALUE.Name = "colVALUE" Me.colVALUE.Visible = True - Me.colVALUE.VisibleIndex = 2 + Me.colVALUE.VisibleIndex = 1 ' 'colADDED_WHO ' Me.colADDED_WHO.FieldName = "ADDED_WHO" Me.colADDED_WHO.Name = "colADDED_WHO" - Me.colADDED_WHO.Visible = True - Me.colADDED_WHO.VisibleIndex = 3 ' 'colADDED_WHEN ' Me.colADDED_WHEN.FieldName = "ADDED_WHEN" Me.colADDED_WHEN.Name = "colADDED_WHEN" - Me.colADDED_WHEN.Visible = True - Me.colADDED_WHEN.VisibleIndex = 4 ' 'colCHANGED_WHO ' Me.colCHANGED_WHO.FieldName = "CHANGED_WHO" Me.colCHANGED_WHO.Name = "colCHANGED_WHO" - Me.colCHANGED_WHO.Visible = True - Me.colCHANGED_WHO.VisibleIndex = 5 ' 'colCHANGED_WHEN ' Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN" Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN" - Me.colCHANGED_WHEN.Visible = True - Me.colCHANGED_WHEN.VisibleIndex = 6 + ' + 'colCOMMENT + ' + Me.colCOMMENT.Caption = "Kommentar" + Me.colCOMMENT.FieldName = "COMMENT" + Me.colCOMMENT.Name = "colCOMMENT" + Me.colCOMMENT.Visible = True + Me.colCOMMENT.VisibleIndex = 2 + ' + 'colACTIVE + ' + Me.colACTIVE.Caption = "Aktiv" + Me.colACTIVE.FieldName = "ACTIVE" + Me.colACTIVE.Name = "colACTIVE" + Me.colACTIVE.Visible = True + Me.colACTIVE.VisibleIndex = 3 + ' + 'colTEMPLATE_ID + ' + Me.colTEMPLATE_ID.Caption = "Vorlagen ID" + Me.colTEMPLATE_ID.FieldName = "TEMPLATE_ID" + Me.colTEMPLATE_ID.Name = "colTEMPLATE_ID" + Me.colTEMPLATE_ID.Visible = True + Me.colTEMPLATE_ID.VisibleIndex = 4 ' 'RibbonControl1 ' @@ -214,8 +350,10 @@ Partial Class frmConfig Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.Size = New System.Drawing.Size(1093, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'BarButtonItem1 ' @@ -248,7 +386,7 @@ Partial Class frmConfig Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'TBEDI_XML_ITEMSTableAdapter + 'TBEDI_XML_TEMPLATE_ITEMSTableAdapter ' Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter.ClearBeforeFill = True ' @@ -261,117 +399,12 @@ Partial Class frmConfig Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBEDI_XML_CONFIGTableAdapter = Me.TBEDI_XML_CONFIGTableAdapter Me.TableAdapterManager.TBEDI_XML_FUNCTIONSTableAdapter = Nothing - Me.TableAdapterManager.TBEDI_XML_TEMPLATE_ITEMSTableAdapter = Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing + Me.TableAdapterManager.TBEDI_XML_TEMPLATE_ITEMSTableAdapter = Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter Me.TableAdapterManager.TBEDI_XML_TEMPLATESTableAdapter = Nothing Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'colGUID - ' - Me.colGUID.FieldName = "GUID" - Me.colGUID.Name = "colGUID" - Me.colGUID.Visible = True - Me.colGUID.VisibleIndex = 0 - ' - 'colXML_NAME - ' - Me.colXML_NAME.FieldName = "XML_NAME" - Me.colXML_NAME.Name = "colXML_NAME" - Me.colXML_NAME.Visible = True - Me.colXML_NAME.VisibleIndex = 1 - ' - 'colXML_TYPE_ID - ' - Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" - Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" - Me.colXML_TYPE_ID.Visible = True - Me.colXML_TYPE_ID.VisibleIndex = 2 - ' - 'colIS_READ_ONLY - ' - Me.colIS_READ_ONLY.FieldName = "IS_READ_ONLY" - Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY" - Me.colIS_READ_ONLY.Visible = True - Me.colIS_READ_ONLY.VisibleIndex = 3 - ' - 'colIS_VISIBLE - ' - Me.colIS_VISIBLE.FieldName = "IS_VISIBLE" - Me.colIS_VISIBLE.Name = "colIS_VISIBLE" - Me.colIS_VISIBLE.Visible = True - Me.colIS_VISIBLE.VisibleIndex = 4 - ' - 'colORDER_KEY - ' - Me.colORDER_KEY.FieldName = "ORDER_KEY" - Me.colORDER_KEY.Name = "colORDER_KEY" - Me.colORDER_KEY.Visible = True - Me.colORDER_KEY.VisibleIndex = 5 - ' - 'colFUNCTION_ID - ' - Me.colFUNCTION_ID.FieldName = "FUNCTION_ID" - Me.colFUNCTION_ID.Name = "colFUNCTION_ID" - Me.colFUNCTION_ID.Visible = True - Me.colFUNCTION_ID.VisibleIndex = 6 - ' - 'colIS_REQUIRED - ' - Me.colIS_REQUIRED.FieldName = "IS_REQUIRED" - Me.colIS_REQUIRED.Name = "colIS_REQUIRED" - Me.colIS_REQUIRED.Visible = True - Me.colIS_REQUIRED.VisibleIndex = 7 - ' - 'colXML_TABLE_ID - ' - Me.colXML_TABLE_ID.FieldName = "XML_TABLE_ID" - Me.colXML_TABLE_ID.Name = "colXML_TABLE_ID" - Me.colXML_TABLE_ID.Visible = True - Me.colXML_TABLE_ID.VisibleIndex = 8 - ' - 'colIS_VIRTUAL - ' - Me.colIS_VIRTUAL.FieldName = "IS_VIRTUAL" - Me.colIS_VIRTUAL.Name = "colIS_VIRTUAL" - Me.colIS_VIRTUAL.Visible = True - Me.colIS_VIRTUAL.VisibleIndex = 9 - ' - 'colFUNCTION_PARAMETERS - ' - Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS" - Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS" - Me.colFUNCTION_PARAMETERS.Visible = True - Me.colFUNCTION_PARAMETERS.VisibleIndex = 10 - ' - 'colADDED_WHO1 - ' - Me.colADDED_WHO1.FieldName = "ADDED_WHO" - Me.colADDED_WHO1.Name = "colADDED_WHO1" - Me.colADDED_WHO1.Visible = True - Me.colADDED_WHO1.VisibleIndex = 11 - ' - 'colADDED_WHEN1 - ' - Me.colADDED_WHEN1.FieldName = "ADDED_WHEN" - Me.colADDED_WHEN1.Name = "colADDED_WHEN1" - Me.colADDED_WHEN1.Visible = True - Me.colADDED_WHEN1.VisibleIndex = 12 - ' - 'colCHANGED_WHO1 - ' - Me.colCHANGED_WHO1.FieldName = "CHANGED_WHO" - Me.colCHANGED_WHO1.Name = "colCHANGED_WHO1" - Me.colCHANGED_WHO1.Visible = True - Me.colCHANGED_WHO1.VisibleIndex = 13 - ' - 'colCHANGED_WHEN1 - ' - Me.colCHANGED_WHEN1.FieldName = "CHANGED_WHEN" - Me.colCHANGED_WHEN1.Name = "colCHANGED_WHEN1" - Me.colCHANGED_WHEN1.Visible = True - Me.colCHANGED_WHEN1.VisibleIndex = 14 - ' 'frmConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -392,7 +425,7 @@ Partial Class frmConfig CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabPage1.ResumeLayout(False) + Me.tabPageConfig.ResumeLayout(False) CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBEDI_XML_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() @@ -417,7 +450,7 @@ Partial Class frmConfig Friend WithEvents TBEDI_XML_CONFIGBindingSource As BindingSource Friend WithEvents TBEDI_XML_CONFIGTableAdapter As DS_DD_ECMTableAdapters.TBEDI_XML_CONFIGTableAdapter Friend WithEvents TableAdapterManager As DS_DD_ECMTableAdapters.TableAdapterManager - Friend WithEvents XtraTabPage1 As XtraTabPage + Friend WithEvents tabPageConfig As XtraTabPage Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colGUID1 As DevExpress.XtraGrid.Columns.GridColumn @@ -442,4 +475,7 @@ Partial Class frmConfig Friend WithEvents colADDED_WHEN1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colCHANGED_WHO1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colCHANGED_WHEN1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCOMMENT As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colACTIVE As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colTEMPLATE_ID As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/MultiTool.Form/frmConfig.resx b/MultiTool.Form/frmConfig.resx index e188f10..43a5a5d 100644 --- a/MultiTool.Form/frmConfig.resx +++ b/MultiTool.Form/frmConfig.resx @@ -129,7 +129,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -143,7 +143,7 @@ IC8+DQo8L3N2Zz4L - + 533, 17 diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 4a13e09..edbd731 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -59,7 +59,7 @@ Public Class frmExportMain Winline = My.Winline FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) - WebService = New WebServiceData(LogConfig, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) + WebService = New WebServiceData(LogConfig, Database, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress Catch ex As Exception @@ -210,7 +210,7 @@ Public Class frmExportMain For Each oRowHandle In oRowHandles oExportCount += 1 - Dim oDocument As Document = GridViewDocuments.GetRow(oRowHandle) + Dim oDocument As ExportDocument = GridViewDocuments.GetRow(oRowHandle) Dim oMandator As Mandator = lookupMandator.EditValue Dim oMessage = String.Format("Beleg {0} exportieren.. ({1}/{2})", oDocument.Number, oExportCount, oRowHandles.Length) diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index b5bf4d1..c0b46cf 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -77,7 +77,7 @@ Public Class frmImportMain Winline = My.Winline FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) - WebService = New WebServiceData(LogConfig, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) + WebService = New WebServiceData(LogConfig, Database, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress Catch ex As Exception diff --git a/MultiTool.Shared/BaseClass.vb b/MultiTool.Shared/BaseClass.vb index 80d1415..b8b4f25 100644 --- a/MultiTool.Shared/BaseClass.vb +++ b/MultiTool.Shared/BaseClass.vb @@ -1,13 +1,17 @@ -Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging Public Class BaseClass - Public ReadOnly LogConfig As LogConfig - Public ReadOnly Logger As Logger - Public ReadOnly Helpers As Helpers + Inherits DigitalData.Modules.Base.BaseClass + + Friend Database As MSSQLServer Public Sub New(pLogConfig As LogConfig) - LogConfig = pLogConfig - Logger = LogConfig.GetLogger() - Helpers = New Helpers(pLogConfig) + MyBase.New(pLogConfig) + End Sub + + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) + MyBase.New(pLogConfig) + Database = pDatabase End Sub End Class diff --git a/MultiTool.Shared/Helpers.vb b/MultiTool.Shared/Helpers.vb deleted file mode 100644 index f8914fd..0000000 --- a/MultiTool.Shared/Helpers.vb +++ /dev/null @@ -1,14 +0,0 @@ -Imports DigitalData.Modules.Logging - -Public Class Helpers - Private ReadOnly LogConfig As LogConfig - Private ReadOnly Logger As Logger - - ''' - ''' This class needs to initialize the logger by itself! - ''' - Public Sub New(pLogConfig As LogConfig) - LogConfig = pLogConfig - Logger = pLogConfig.GetLogger - End Sub -End Class diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj b/MultiTool.Shared/MultiTool.Shared.vbproj index bd4e5bd..d448f4e 100644 --- a/MultiTool.Shared/MultiTool.Shared.vbproj +++ b/MultiTool.Shared/MultiTool.Shared.vbproj @@ -50,6 +50,9 @@ + + ..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -107,7 +110,6 @@ - @@ -137,7 +139,7 @@ - + diff --git a/MultiTool.Shared/Patterns.vb b/MultiTool.Shared/Patterns.vb index 4a7576e..99e2d1f 100644 --- a/MultiTool.Shared/Patterns.vb +++ b/MultiTool.Shared/Patterns.vb @@ -65,7 +65,7 @@ Public Class Patterns Return oString End Function - Public Function ReplaceForExport(pTemplate As Template, pDocument As Winline.Entities.Document, pMandator As Mandator, oString As String) + Public Function ReplaceForExport(pTemplate As Template, pDocument As ExportDocument, pMandator As Mandator, oString As String) Dim oRegex = New Regex("{#(\w+)#([\w\s_-]+)}+") Dim oMatches As MatchCollection = oRegex.Matches(oString) diff --git a/MultiTool.Shared/Winline/Entities/Document.vb b/MultiTool.Shared/Winline/Entities/ExportDocument.vb similarity index 95% rename from MultiTool.Shared/Winline/Entities/Document.vb rename to MultiTool.Shared/Winline/Entities/ExportDocument.vb index 1750e42..df37c67 100644 --- a/MultiTool.Shared/Winline/Entities/Document.vb +++ b/MultiTool.Shared/Winline/Entities/ExportDocument.vb @@ -1,5 +1,5 @@ Namespace Winline.Entities - Public Class Document + Public Class ExportDocument Public Property Schema As Templates.Template Public Property Account As Account diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb index d5cdc3d..e83edbc 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Shared/Winline/WebServiceData.vb @@ -1,6 +1,7 @@ Imports System.Net.Http Imports System.Text Imports System.Xml +Imports DigitalData.Modules.Database Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Logging Imports MultiTool.Shared.Documents @@ -17,14 +18,16 @@ Namespace Winline Private ReadOnly GeneralConfig As GeneralConfig Private ReadOnly Winline As WinlineData Private ReadOnly FileEx As File + Private ReadOnly Patterns As Patterns Public Event WebServiceProgress As EventHandler(Of String) - Public Sub New(pLogConfig As LogConfig, pWinline As WinlineData, pWebserviceConfig As WebServiceConfig, pGeneralConfig As GeneralConfig) - MyBase.New(pLogConfig) + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pWinline As WinlineData, pWebserviceConfig As WebServiceConfig, pGeneralConfig As GeneralConfig) + MyBase.New(pLogConfig, pDatabase) Serializer = New Serializer(pLogConfig) Config = pWebserviceConfig GeneralConfig = pGeneralConfig + Patterns = New Patterns(pLogConfig, pGeneralConfig) FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) Winline = pWinline End Sub @@ -202,7 +205,7 @@ Namespace Winline #End Region #Region "Export" - Async Function ExportDocumentFromWinline(pDocument As Entities.Document, pTemplate As Template, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean) + Async Function ExportDocumentFromWinline(pDocument As Entities.ExportDocument, pTemplate As Template, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean) Dim oWS = Config ' --- Build all teh filenamez and pathz @@ -247,7 +250,7 @@ Namespace Winline ' --- Bring the action! Try Dim oResponse As HttpResponseMessage = Await oClient.GetAsync(oURL) - Await HandleExportResponse(oResponse, pTemplate, pMandator, oBaseFileName) + Await HandleExportResponse(oResponse, pDocument, pTemplate, pMandator, oBaseFileName) Return True @@ -261,7 +264,7 @@ Namespace Winline End Try End Function - Private Async Function HandleExportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pMandator As Mandator, pBaseFileNAme As String) As Task + Private Async Function HandleExportResponse(pResponse As HttpResponseMessage, pDocument As Entities.ExportDocument, pTemplate As Template, pMandator As Mandator, pBaseFileNAme As String) As Task pResponse.EnsureSuccessStatusCode() Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync() Dim oContentType = pResponse.Content.Headers.ContentType.MediaType @@ -269,7 +272,7 @@ Namespace Winline RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten") - oResponseBody = ApplyItemFunctionsForExport(pTemplate, pMandator, oResponseBody) + oResponseBody = ApplyItemFunctionsForExport(pDocument, pTemplate, pMandator, oResponseBody) Select Case oContentType Case "text/xml" @@ -287,7 +290,7 @@ Namespace Winline End Select End Function - Private Function ApplyItemFunctionsForExport(pTemplate As Template, pMandator As Mandator, oResponseBody As String) As String + Private Function ApplyItemFunctionsForExport(pDocument As Entities.ExportDocument, pTemplate As Template, pMandator As Mandator, oResponseBody As String) As String Dim oDoc As New XmlDocument() oDoc.LoadXml(oResponseBody) @@ -301,23 +304,41 @@ Namespace Winline End If Dim oFunction = oItem.Config.Function.Name - Dim oNode = oDoc.SelectSingleNode($"//MESOWebService/{oTableName}/{oItemName}") - If oItem.Config.Function.Name = "GLN" Then - Dim oGLN = Winline.TryGetGLN(oNode.InnerText, pMandator) - If oGLN Is Nothing Then - Throw New Exceptions.MissingAttributeException("GLN") + Dim oPath = $"//MESOWebService/{oTableName}/{oItemName}" + Dim oNodes As XmlNodeList = oDoc.SelectNodes(oPath) + + For Each oNode As XmlNode In oNodes + If oItem.Config.Function.Name = "GLN" Then + Dim oGLN = Winline.TryGetGLN(oNode.InnerText, pMandator) + + If oGLN Is Nothing Then + Throw New Exceptions.MissingAttributeException("GLN") + End If + + oNode.InnerText = oGLN + + ElseIf oItem.Config.Function.Name = "EAN" Then + Dim oEAN = Winline.TryGetEAN(oNode.InnerText, pMandator) + + If oEAN Is Nothing Then + Throw New Exceptions.MissingAttributeException("EAN") + End If + + oNode.InnerText = oEAN + + ElseIf oItem.Config.Function.Name = "SQL" Then + Dim oSQL = Patterns.ReplaceForExport(pTemplate, pDocument, pMandator, oItem.Config.Function.Params) + Dim oValue = Database.GetScalarValue(oSQL) + + If oValue Is Nothing Then + Throw New Exceptions.MissingAttributeException("SQL") + End If + + oNode.InnerText = oValue + End If - - oNode.InnerText = oGLN - ElseIf oItem.Config.Function.Name = "EAN" Then - Dim oEAN = Winline.TryGetEAN(oNode.InnerText, pMandator) - If oEAN Is Nothing Then - Throw New Exceptions.MissingAttributeException("EAN") - End If - - oNode.InnerText = oEAN - End If + Next Next Next diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index 72f8c7b..9221f2f 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -528,7 +528,7 @@ Namespace Winline Return Nothing End Function - Public Function GetDocuments(pMandator As Mandator, pTemplate As Template, pDocumentType As Integer, pOptions As GetDocumentArgs) As List(Of Document) + Public Function GetDocuments(pMandator As Mandator, pTemplate As Template, pDocumentType As Integer, pOptions As GetDocumentArgs) As List(Of ExportDocument) Try Dim oYear As Integer = Config.GetWinLineYear() @@ -615,7 +615,7 @@ Namespace Winline {oDateToConstraint} T.[mesocomp] = '{pMandator.Id}' AND T.[mesoyear] = {oYear}" Dim oTable As DataTable = Database.GetDatatable(oSql) - Dim oDocuments As New List(Of Document) + Dim oDocuments As New List(Of ExportDocument) For Each oRow As DataRow In oTable.Rows Try @@ -639,7 +639,7 @@ Namespace Winline End Try End Function - Public Async Function ExecuteFinalSQL(pDocument As Document, pTemplate As Template, pMandator As Mandator) As Task(Of Boolean) + Public Async Function ExecuteFinalSQL(pDocument As ExportDocument, pTemplate As Template, pMandator As Mandator) As Task(Of Boolean) Try Dim oSql As String = Patterns.ReplaceForExport(pTemplate, pDocument, pMandator, pTemplate.FinalSQL) Return Await Database.ExecuteNonQueryAsync(oSql) @@ -650,7 +650,7 @@ Namespace Winline End Try End Function - Private Function GetDocumentFromDataRow(pDataRow As DataRow) As Document + Private Function GetDocumentFromDataRow(pDataRow As DataRow) As ExportDocument Dim oAccountNumber = pDataRow.Item("ACCOUNT_NUMBER") Dim oRunningNumber As String = pDataRow.Item("RUNNING_NUMBER") Dim oDocumentType As Integer = pDataRow.Item("DOCUMENT_TYPE") @@ -694,7 +694,7 @@ Namespace Winline End Select - Dim oDocument As New Document With { + Dim oDocument As New ExportDocument With { .Account = oAccount, .RunningNumber = oRunningNumber, .Number = oDocumentNumber,