Datenbank für 7.0 erweitert. Schengen und PAX Felder als Kompromiss in CREW/PAS direkt eingebaut, die Indirektion wäre zu kompliziert geworden..

SQL/Update_6.x_To_7.0.sql

@@ -0,0 +1,103 @@
+
+PRINT N'Altering [dbo].[WAS]...';
+GO
+
+ALTER TABLE [dbo].[WAS]
+    ADD [NextWasteDisposalPort] NCHAR (5) NULL;
+GO
+
+PRINT N'Creating [dbo].[WAS_RCPT]...';
+
+GO
+CREATE TABLE [dbo].[WAS_RCPT] (
+    [Id]                                UNIQUEIDENTIFIER NOT NULL,
+    [MessageHeaderId]                   UNIQUEIDENTIFIER NULL,
+    [IdentificationNumber]              NVARCHAR (20)    NULL,
+    [PortReceptionFacilityName]         NVARCHAR (70)    NULL,
+    [PortReceptionFacilityProviderName] NVARCHAR (70)    NULL,
+    [WasteDeliveryDateFrom]             DATETIME         NULL,
+    [WasteDeliveryDateTo]               DATETIME         NULL,
+    PRIMARY KEY CLUSTERED ([Id] ASC)
+);
+
+GO
+
+PRINT N'Creating [dbo].[FK_WAS_RCPT_MessageHeader]...';
+GO
+
+ALTER TABLE [dbo].[WAS_RCPT] WITH NOCHECK
+    ADD CONSTRAINT [FK_WAS_RCPT_MessageHeader] FOREIGN KEY ([MessageHeaderId]) REFERENCES [dbo].[MessageHeader] ([Id]);
+GO
+
+ALTER TABLE [dbo].[WAS_RCPT] WITH CHECK CHECK CONSTRAINT [FK_WAS_RCPT_MessageHeader];
+GO
+
+
+PRINT N'Creating [dbo].[TreatmentFacilityProvider]...';
+GO
+
+CREATE TABLE [dbo].[TreatmentFacilityProvider] (
+    [Id]                            UNIQUEIDENTIFIER NOT NULL,
+    [WAS_RCPTId]                    UNIQUEIDENTIFIER NULL,
+    [TreatmentFacilityProviderName] NVARCHAR (70)    NULL,
+    [Identifier]                    NVARCHAR (50)    NULL,
+    PRIMARY KEY CLUSTERED ([Id] ASC)
+);
+
+PRINT N'Creating [dbo].[FK_TreatmentFacilityProvider_WAS_RCPT]...';
+GO
+
+ALTER TABLE [dbo].[TreatmentFacilityProvider] WITH NOCHECK
+    ADD CONSTRAINT [FK_TreatmentFacilityProvider_WAS_RCPT] FOREIGN KEY ([WAS_RCPTId]) REFERENCES [dbo].[WAS_RCPT] ([Id]);
+GO
+
+ALTER TABLE [dbo].[TreatmentFacilityProvider] WITH CHECK CHECK CONSTRAINT [FK_TreatmentFacilityProvider_WAS_RCPT];
+GO
+
+
+PRINT N'Creating [dbo].[WasteReceived]...';
+GO
+
+CREATE TABLE [dbo].[WasteReceived] (
+    [Id]                      UNIQUEIDENTIFIER NOT NULL,
+    [WAS_RCPTId]              UNIQUEIDENTIFIER NULL,
+    [WasteCode]               NCHAR (3)        NULL,
+    [WasteDescription]        NVARCHAR (256)   NULL,
+    [AmountWasteReceived_MTQ] FLOAT (53)       NULL,
+    [Identifier]              NVARCHAR (50)    NULL,
+    PRIMARY KEY CLUSTERED ([Id] ASC)
+);
+GO
+
+PRINT N'Creating [dbo].[FK_WasteReceived_WAS_RCPT]...';
+GO
+
+ALTER TABLE [dbo].[WasteReceived] WITH NOCHECK
+    ADD CONSTRAINT [FK_WasteReceived_WAS_RCPT] FOREIGN KEY ([WAS_RCPTId]) REFERENCES [dbo].[WAS_RCPT] ([Id]);
+GO
+
+ALTER TABLE [dbo].[WasteReceived] WITH CHECK CHECK CONSTRAINT [FK_WasteReceived_WAS_RCPT];
+GO
+
+PRINT N'Altering [dbo].[CREW]...';
+GO
+
+ALTER TABLE [dbo].[CREW]
+    ADD [NotificationSchengen] BIT NULL,
+        [NotificationPAX]      BIT NULL;
+GO
+
+PRINT N'Altering [dbo].[PAS]...';
+GO
+
+ALTER TABLE [dbo].[PAS]
+    ADD [NotificationSchengen] BIT NULL,
+        [NotificationPAX]      BIT NULL;
+GO
+
+PRINT N'Altering [dbo].[IMDGPosition]...';
+GO
+
+ALTER TABLE [dbo].[IMDGPosition]
+    ADD [Class7MaxActivity_Unit] TINYINT NULL;
+GO

bsmd.database/WAS.cs

@@ -52,6 +52,12 @@ namespace bsmd.database
         [ENI2Validation]
         public string LastWasteDisposalPort { get; set; }
 
+        [ShowReport]
+        [Validation2(ValidationCode.LOCODE_SSN)]
+        [MaxLength(5)]
+        [ENI2Validation]
+        public string NextWasteDisposalPort { get; set; }
+
         [ShowReport]
         [Validation2(ValidationCode.NOT_NULL)]
         [LookupName("WAS.ConfirmationOfCorrectness")]
@@ -65,6 +71,7 @@ namespace bsmd.database
         [DateOnly]
         public DateTime? LastWasteDisposalDate { get; set; }
 
+        [Obsolete]
         [ShowReport]
         [Validation2(ValidationCode.NOT_NULL)]
         [ENI2Validation]

bsmd.database/Waste.cs

@@ -11,6 +11,7 @@ using System.Data.SqlClient;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using System.ComponentModel;
+using System;
 
 namespace bsmd.database
 {
@@ -129,6 +130,7 @@ namespace bsmd.database
         [Validation(ValidationCode.NOT_NULL)]
         public double? WasteAmountGeneratedTillNextPort_MTQ { get; set; }
         
+        [Obsolete]
         [ENI2Validation]
         [Validation(ValidationCode.NOT_NULL)]
         public double? WasteDisposedAtLastPort_MTQ { get; set; }