diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 48d733f3..f4f2d72a 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/HIS-NORD/xsd.assert/agent_reeder.xsd b/nsw/HIS-NORD/xsd.assert/agent_reeder.xsd new file mode 100644 index 00000000..fb7a69db --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/agent_reeder.xsd @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/basic_types.xsd b/nsw/HIS-NORD/xsd.assert/basic_types.xsd new file mode 100644 index 00000000..6806fc62 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/basic_types.xsd @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd b/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd index 07a0d412..cf60c3bf 100644 --- a/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/bpol_reeder.xsd @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/bunker_reeder.xsd b/nsw/HIS-NORD/xsd.assert/bunker_reeder.xsd new file mode 100644 index 00000000..c71b81de --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/bunker_reeder.xsd @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd b/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd index ac442e93..56a827dd 100644 --- a/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/crew_reeder.xsd @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/hazmat_reeder.xsd b/nsw/HIS-NORD/xsd.assert/hazmat_reeder.xsd new file mode 100644 index 00000000..338d66ad --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/hazmat_reeder.xsd @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd b/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd index e2b99dc0..ba13e22a 100644 --- a/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/his-nord_nsw_v-1-0_all_reeder.xsd @@ -1,803 +1,124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/info_reeder.xsd b/nsw/HIS-NORD/xsd.assert/info_reeder.xsd new file mode 100644 index 00000000..a555bbf7 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/info_reeder.xsd @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd b/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd index 6a5609b3..3eb3c7cc 100644 --- a/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/mdh_reeder.xsd @@ -1,5 +1,5 @@ - + @@ -14,26 +14,35 @@ - + + - + + - + - + + + + + + + + @@ -41,6 +50,13 @@ + + + + + + + @@ -48,6 +64,13 @@ + + + + + + + diff --git a/nsw/HIS-NORD/xsd.assert/noanod_reeder.xsd b/nsw/HIS-NORD/xsd.assert/noanod_reeder.xsd new file mode 100644 index 00000000..b565fa6f --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/noanod_reeder.xsd @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/owner_reeder.xsd b/nsw/HIS-NORD/xsd.assert/owner_reeder.xsd new file mode 100644 index 00000000..7e3886dc --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/owner_reeder.xsd @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd b/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd index 3948a196..20d3c6ce 100644 --- a/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/pas_reeder.xsd @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/pob_reeder.xsd b/nsw/HIS-NORD/xsd.assert/pob_reeder.xsd new file mode 100644 index 00000000..8f757e3e --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/pob_reeder.xsd @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd b/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd index 4990b801..fceaf21d 100644 --- a/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/prearrival72_reeder.xsd @@ -1,5 +1,5 @@ - + @@ -7,7 +7,8 @@ - + + diff --git a/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd b/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd index 3cb27de5..e85d968f 100644 --- a/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/sec_reeder.xsd @@ -1,108 +1,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd b/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd index fe07ad99..e4d75ab6 100644 --- a/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/serv_reeder.xsd @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd b/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd index bda4fe26..bb7e5ca5 100644 --- a/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/tow_reeder.xsd @@ -1,5 +1,5 @@ - + diff --git a/nsw/HIS-NORD/xsd.assert/vessel_reeder.xsd b/nsw/HIS-NORD/xsd.assert/vessel_reeder.xsd new file mode 100644 index 00000000..54f00d71 --- /dev/null +++ b/nsw/HIS-NORD/xsd.assert/vessel_reeder.xsd @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd b/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd index 07af9fb9..385ea236 100644 --- a/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd +++ b/nsw/HIS-NORD/xsd.assert/waste_reeder.xsd @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.dakosy.ResponseService/SFTPService.cs b/nsw/Source/bsmd.dakosy.ResponseService/SFTPService.cs index 14d76a30..60d33df5 100644 --- a/nsw/Source/bsmd.dakosy.ResponseService/SFTPService.cs +++ b/nsw/Source/bsmd.dakosy.ResponseService/SFTPService.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; +using bsmd.database; +using log4net; +using System; using System.Diagnostics; using System.IO; -using System.Linq; using System.ServiceProcess; -using System.Text; using System.Timers; -using System.Threading.Tasks; -using log4net; - -using bsmd.database; -using bsmd.dakosy; namespace bsmd.dakosy.ResponseService { @@ -74,7 +66,6 @@ namespace bsmd.dakosy.ResponseService try { Response.ReadAll(); - } catch (Exception ex) { @@ -83,8 +74,7 @@ namespace bsmd.dakosy.ResponseService } else { - this.EventLog.WriteEntry("FormService stopped: DB connection failed", EventLogEntryType.Error); - this.Stop(); + this.EventLog.WriteEntry("FormService DB connection failure", EventLogEntryType.Error); } lock (this._timerlock) diff --git a/nsw/Source/bsmd.dakosy.ResponseService/bsmd.dakosy.ResponseService.csproj b/nsw/Source/bsmd.dakosy.ResponseService/bsmd.dakosy.ResponseService.csproj index 200283b1..8febfac1 100644 --- a/nsw/Source/bsmd.dakosy.ResponseService/bsmd.dakosy.ResponseService.csproj +++ b/nsw/Source/bsmd.dakosy.ResponseService/bsmd.dakosy.ResponseService.csproj @@ -38,8 +38,9 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll + True @@ -85,7 +86,9 @@ - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/nsw/Source/bsmd.dakosy.ResponseService/packages.config b/nsw/Source/bsmd.dakosy.ResponseService/packages.config index 981a91a1..a51db168 100644 --- a/nsw/Source/bsmd.dakosy.ResponseService/packages.config +++ b/nsw/Source/bsmd.dakosy.ResponseService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/nsw/Source/bsmd.dakosy/Request.cs b/nsw/Source/bsmd.dakosy/Request.cs index 0240277b..2a8641d5 100644 --- a/nsw/Source/bsmd.dakosy/Request.cs +++ b/nsw/Source/bsmd.dakosy/Request.cs @@ -33,6 +33,7 @@ namespace bsmd.dakosy // fill eDeclaration class eDeclarationMessage edm = new eDeclarationMessage(); + edm.Version = "3.0"; // TODO // edm.Version = "08.15"; // entfernt auf Anraten von Fr. Ebeling 30.6.15 edm.InterchangeHeader = new InterchangeHeaderType(); edm.InterchangeHeader.CreationTime = DateTime.UtcNow; @@ -73,9 +74,10 @@ namespace bsmd.dakosy vList.Visit[0].MessageHeader.MessageSender = new Participant(); vList.Visit[0].MessageHeader.MessageSender.ParticipantCode = new ParticipantCode(); vList.Visit[0].MessageHeader.MessageSender.ParticipantCode.AgencyID = "DAK"; - vList.Visit[0].MessageHeader.MessageSender.ParticipantCode.Value = "BSM"; // TODO -> Absprache! + vList.Visit[0].MessageHeader.MessageSender.ParticipantCode.Value = "BSM"; vList.Visit[0].MessageHeader.MessageReferenceNumber = aMessage.Id.Value.ToString("N"); - vList.Visit[0].MessageType = MessageType.FULL; // bei DRAFT geht es nicht an das NSW + // bei DRAFT geht es nicht an das NSW + vList.Visit[0].MessageType = Properties.Settings.Default.TestMode ? MessageType.DRAFT : MessageType.FULL; if (aMessage.MessageCore.IsTransit) vList.Visit[0].TransitID = aMessage.MessageCore.TransitId; else @@ -120,6 +122,35 @@ namespace bsmd.dakosy switch (aMessage.MessageNotificationClass) { + case Message.NotificationClass.AGNT: + { + bsmd.database.AGNT agnt = aMessage.Elements[0] as bsmd.database.AGNT; + vList.Visit[0].AGNT = new AGNT(); + vList.Visit[0].AGNT.CompanyName = agnt.AgentCompanyName; + + int lastBlank = agnt.AgentStreetAndNumber.LastIndexOf(' '); + string number = (lastBlank > 0) ? agnt.AgentStreetAndNumber.Substring(lastBlank) : ""; + if ((lastBlank > 0) && (number.Length > 0) && (Char.IsNumber(number[0]))) + { + vList.Visit[0].AGNT.StreetName = agnt.AgentStreetAndNumber.Substring(0, lastBlank); + vList.Visit[0].AGNT.StreetNumber = agnt.AgentStreetAndNumber.Substring(lastBlank); + } + else + { + vList.Visit[0].AGNT.StreetName = agnt.AgentStreetAndNumber; + vList.Visit[0].AGNT.StreetNumber = ""; + } + + vList.Visit[0].AGNT.PostalCode = agnt.AgentPostalCode; + vList.Visit[0].AGNT.City = agnt.AgentCity; + vList.Visit[0].AGNT.Country = agnt.AgentCountry; + vList.Visit[0].AGNT.LastName = agnt.AgentLastName; + vList.Visit[0].AGNT.FirstName = agnt.AgentFirstName; + vList.Visit[0].AGNT.Phone = agnt.AgentPhone; + vList.Visit[0].AGNT.Fax = agnt.AgentFax; + vList.Visit[0].AGNT.EMail = agnt.AgentEMail; + } + break; case Message.NotificationClass.NOA_NOD: bsmd.database.NOA_NOD noa_nod = aMessage.Elements[0] as bsmd.database.NOA_NOD; if (noa_nod == null) throw new ApplicationException("dbEntity is no NOA_NOD message!"); @@ -212,7 +243,7 @@ namespace bsmd.dakosy } break; - case Message.NotificationClass.LADG: // TBD: dito + case Message.NotificationClass.LADG: { if (aMessage.Elements.Count > 0) { @@ -235,7 +266,7 @@ namespace bsmd.dakosy } } break; - case Message.NotificationClass.CREW: // TBD: dito + case Message.NotificationClass.CREW: { if (aMessage.Elements.Count > 0) { @@ -290,6 +321,9 @@ namespace bsmd.dakosy vList.Visit[0].INFO.DeadWeightSummerTNESpecified = info.DeplacementSummerDraught_TNE.HasValue; if (info.DeplacementSummerDraught_TNE.HasValue) vList.Visit[0].INFO.DeadWeightSummerTNE = info.DeplacementSummerDraught_TNE.Value; + vList.Visit[0].INFO.PortArea = info.PortArea; + vList.Visit[0].INFO.BowThrusterPower = info.BowThrusterPower; + vList.Visit[0].INFO.SternThrusterPower = info.SternThrusterPower; break; case Message.NotificationClass.MDH: bsmd.database.MDH mdh = aMessage.Elements[0] as bsmd.database.MDH; @@ -316,13 +350,17 @@ namespace bsmd.dakosy vList.Visit[0].MDH.AwareOfConditionsForFurtherInfections = mdh.AwareOfFurtherInfections ?? false; vList.Visit[0].MDH.SanitaryMeasuresAppliedSpecified = mdh.SanitaryMeasuresApplied.HasValue; vList.Visit[0].MDH.SanitaryMeasuresApplied = mdh.SanitaryMeasuresApplied ?? false; - if (mdh.SanitaryMeasuresApplied ?? false) + if (mdh.SanitaryMeasuresApplied ?? false && (mdh.SanitaryMeasuresDetails.Count > 0)) { - vList.Visit[0].MDH.SanitaryMeasuresDetails = new SanitaryMeasuresDetails(); - vList.Visit[0].MDH.SanitaryMeasuresDetails.SanitaryMeasuresType = mdh.SanitaryMeasuresType; - vList.Visit[0].MDH.SanitaryMeasuresDetails.SanitaryMeasuresLocation = mdh.SanitaryMeasuresLocation; - if (mdh.SanitaryMeasuresDate.HasValue) - vList.Visit[0].MDH.SanitaryMeasuresDetails.SanitaryMeasuresDate = mdh.SanitaryMeasuresDate.Value; + vList.Visit[0].MDH.SanitaryMeasuresDetails = new SanitaryMeasuresDetails[mdh.SanitaryMeasuresDetails.Count]; + for (int smIndex = 0; smIndex < mdh.SanitaryMeasuresDetails.Count; smIndex++) { + SanitaryMeasuresDetails smDetails = new SanitaryMeasuresDetails(); + if (mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresDate.HasValue) + smDetails.SanitaryMeasuresDate = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresDate.Value; + smDetails.SanitaryMeasuresLocation = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresLocation; + smDetails.SanitaryMeasuresType = mdh.SanitaryMeasuresDetails[smIndex].SanitaryMeasuresType; + vList.Visit[0].MDH.SanitaryMeasuresDetails[smIndex] = smDetails; + } } vList.Visit[0].MDH.StowawaysDetectedSpecified = mdh.StowawaysDetected.HasValue; vList.Visit[0].MDH.StowawaysDetected = mdh.StowawaysDetected ?? false; @@ -339,12 +377,17 @@ namespace bsmd.dakosy vList.Visit[0].MDH.SanitaryControlReinspectionRequired = mdh.SanitaryControlReinspectionRequired ?? false; vList.Visit[0].MDH.InfectedAreaVisitedSpecified = mdh.InfectedAreaVisited.HasValue; vList.Visit[0].MDH.InfectedAreaVisited = mdh.InfectedAreaVisited ?? false; - if (mdh.InfectedAreaVisited ?? false) + if (mdh.InfectedAreaVisited ?? false && (mdh.InfectedAreas.Count > 0)) { - vList.Visit[0].MDH.InfectedArea = new InfectedArea(); - if (mdh.InfectedAreaDate.HasValue) - vList.Visit[0].MDH.InfectedArea.InfectedAreaDate = mdh.InfectedAreaDate.Value; - vList.Visit[0].MDH.InfectedArea.InfectedAreaPort = mdh.InfectedAreaPort; + vList.Visit[0].MDH.InfectedArea = new InfectedArea[mdh.InfectedAreas.Count]; + for (int iaIndex = 0; iaIndex < mdh.InfectedAreas.Count; iaIndex++) + { + InfectedArea infectedArea = new InfectedArea(); + if (mdh.InfectedAreas[iaIndex].InfectedAreaDate.HasValue) + infectedArea.InfectedAreaDate = mdh.InfectedAreas[iaIndex].InfectedAreaDate.Value; + infectedArea.InfectedAreaPort = mdh.InfectedAreas[iaIndex].InfectedAreaPort; + vList.Visit[0].MDH.InfectedArea[iaIndex] = infectedArea; + } } if (mdh.PortOfCallLast30Days.Count > 0) { @@ -658,6 +701,9 @@ namespace bsmd.dakosy } vList.Visit[0].STAT.ISMCompany.IsmCompanyCity = stat.ISMCompanyCity; vList.Visit[0].STAT.ISMCompany.IsmCompanyCountry = stat.ISMCompanyCountry; + vList.Visit[0].STAT.TransportModeSpecified = !stat.TransportMode.IsNullOrEmpty(); + if(vList.Visit[0].STAT.TransportModeSpecified) + vList.Visit[0].STAT.TransportMode = (stat.TransportMode == "1") ? TransportModeType.Item1 : TransportModeType.Item8; } break; case Message.NotificationClass.WAS: diff --git a/nsw/Source/bsmd.dakosy/eDeclaration.cs b/nsw/Source/bsmd.dakosy/eDeclaration.cs index 89382cab..e32c61cd 100644 --- a/nsw/Source/bsmd.dakosy/eDeclaration.cs +++ b/nsw/Source/bsmd.dakosy/eDeclaration.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.34209 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -11,12 +11,12 @@ using System.Xml.Serialization; // -// This source code was auto-generated by xsd, Version=4.0.30319.33440. +// Dieser Quellcode wurde automatisch generiert von xsd, Version=4.6.1055.0. // /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -63,7 +63,7 @@ public partial class eDeclarationMessage { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -145,7 +145,7 @@ public partial class InterchangeHeaderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -166,7 +166,7 @@ public partial class Participant { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -201,7 +201,7 @@ public partial class ParticipantCode { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -235,7 +235,7 @@ public partial class ErrorInfo { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -293,7 +293,7 @@ public partial class ResponseError { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -338,7 +338,7 @@ public partial class WildCardFreeText { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -384,7 +384,7 @@ public partial class AdditionalValue { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -429,7 +429,7 @@ public partial class CommunicationDataType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -635,7 +635,7 @@ public partial class EdiResponse { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -705,7 +705,7 @@ public partial class MessageHeaderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum EdiResponseType { @@ -724,7 +724,7 @@ public enum EdiResponseType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum EdiResponseSubType { @@ -737,7 +737,7 @@ public enum EdiResponseSubType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -758,7 +758,7 @@ public partial class ResetNotification { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum NotificationType { @@ -834,7 +834,148 @@ public enum NotificationType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class AGNT { + + private string companyNameField; + + private string streetNameField; + + private string streetNumberField; + + private string postalCodeField; + + private string cityField; + + private string countryField; + + private string lastNameField; + + private string firstNameField; + + private string phoneField; + + private string faxField; + + private string eMailField; + + /// + public string CompanyName { + get { + return this.companyNameField; + } + set { + this.companyNameField = value; + } + } + + /// + public string StreetName { + get { + return this.streetNameField; + } + set { + this.streetNameField = value; + } + } + + /// + public string StreetNumber { + get { + return this.streetNumberField; + } + set { + this.streetNumberField = value; + } + } + + /// + public string PostalCode { + get { + return this.postalCodeField; + } + set { + this.postalCodeField = value; + } + } + + /// + public string City { + get { + return this.cityField; + } + set { + this.cityField = value; + } + } + + /// + public string Country { + get { + return this.countryField; + } + set { + this.countryField = value; + } + } + + /// + public string LastName { + get { + return this.lastNameField; + } + set { + this.lastNameField = value; + } + } + + /// + public string FirstName { + get { + return this.firstNameField; + } + set { + this.firstNameField = value; + } + } + + /// + public string Phone { + get { + return this.phoneField; + } + set { + this.phoneField = value; + } + } + + /// + public string Fax { + get { + return this.faxField; + } + set { + this.faxField = value; + } + } + + /// + public string EMail { + get { + return this.eMailField; + } + set { + this.eMailField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -979,7 +1120,7 @@ public partial class Waste { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum WasteType { @@ -1013,7 +1154,7 @@ public enum WasteType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1034,7 +1175,7 @@ public partial class WasteDisposalServiceProviderName { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1182,7 +1323,7 @@ public partial class WAS { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum WasteDisposalDeliveryType { @@ -1198,7 +1339,7 @@ public enum WasteDisposalDeliveryType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1291,7 +1432,7 @@ public partial class ISMCompany { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1322,6 +1463,10 @@ public partial class STAT { private string inmarsatCallNumberField; + private TransportModeType transportModeField; + + private bool transportModeFieldSpecified; + private string shipTypeField; private ISMCompany iSMCompanyField; @@ -1449,6 +1594,27 @@ public partial class STAT { } } + /// + public TransportModeType TransportMode { + get { + return this.transportModeField; + } + set { + this.transportModeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool TransportModeSpecified { + get { + return this.transportModeFieldSpecified; + } + set { + this.transportModeFieldSpecified = value; + } + } + /// public string ShipType { get { @@ -1471,7 +1637,22 @@ public partial class STAT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public enum TransportModeType { + + /// + [System.Xml.Serialization.XmlEnumAttribute("1")] + Item1, + + /// + [System.Xml.Serialization.XmlEnumAttribute("8")] + Item8, +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1576,7 +1757,7 @@ public partial class TOWDOperator { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1708,7 +1889,7 @@ public partial class TowageDeparture { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1813,7 +1994,7 @@ public partial class TOWAOperator { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1969,7 +2150,7 @@ public partial class TowageArrival { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2014,7 +2195,166 @@ public partial class Service { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class ShipToShipActivities { + + private string locationNameField; + + private string locationCodeField; + + private int locationCoordinatesLatitudeField; + + private bool locationCoordinatesLatitudeFieldSpecified; + + private int locationCoordinatesLongitudeField; + + private bool locationCoordinatesLongitudeFieldSpecified; + + private System.DateTime dateFromField; + + private bool dateFromFieldSpecified; + + private System.DateTime dateToField; + + private bool dateToFieldSpecified; + + private string activityTypeField; + + private string securityMattersToReportField; + + /// + public string LocationName { + get { + return this.locationNameField; + } + set { + this.locationNameField = value; + } + } + + /// + public string LocationCode { + get { + return this.locationCodeField; + } + set { + this.locationCodeField = value; + } + } + + /// + public int LocationCoordinatesLatitude { + get { + return this.locationCoordinatesLatitudeField; + } + set { + this.locationCoordinatesLatitudeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LocationCoordinatesLatitudeSpecified { + get { + return this.locationCoordinatesLatitudeFieldSpecified; + } + set { + this.locationCoordinatesLatitudeFieldSpecified = value; + } + } + + /// + public int LocationCoordinatesLongitude { + get { + return this.locationCoordinatesLongitudeField; + } + set { + this.locationCoordinatesLongitudeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LocationCoordinatesLongitudeSpecified { + get { + return this.locationCoordinatesLongitudeFieldSpecified; + } + set { + this.locationCoordinatesLongitudeFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="date")] + public System.DateTime DateFrom { + get { + return this.dateFromField; + } + set { + this.dateFromField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DateFromSpecified { + get { + return this.dateFromFieldSpecified; + } + set { + this.dateFromFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="date")] + public System.DateTime DateTo { + get { + return this.dateToField; + } + set { + this.dateToField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DateToSpecified { + get { + return this.dateToFieldSpecified; + } + set { + this.dateToFieldSpecified = value; + } + } + + /// + public string ActivityType { + get { + return this.activityTypeField; + } + set { + this.activityTypeField = value; + } + } + + /// + public string SecurityMattersToReport { + get { + return this.securityMattersToReportField; + } + set { + this.securityMattersToReportField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2173,7 +2513,7 @@ public partial class ShipToShipActivitiesDuringLastTenPortFacilitiesCalled { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2319,7 +2659,7 @@ public partial class LastTenPortFacilitiesCalled { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2380,6 +2720,8 @@ public partial class SEC { private ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[] shipToShipActivitiesDuringLastTenPortFacilitiesCalledField; + private ShipToShipActivities[] shipToShipActivitiesField; + /// public bool SecSimplification { get { @@ -2660,10 +3002,21 @@ public partial class SEC { this.shipToShipActivitiesDuringLastTenPortFacilitiesCalledField = value; } } + + /// + [System.Xml.Serialization.XmlElementAttribute("ShipToShipActivities")] + public ShipToShipActivities[] ShipToShipActivities { + get { + return this.shipToShipActivitiesField; + } + set { + this.shipToShipActivitiesField = value; + } + } } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IsscType { @@ -2676,7 +3029,7 @@ public enum IsscType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IsscIssuerType { @@ -2689,7 +3042,7 @@ public enum IsscIssuerType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum GeneralCargoType { @@ -2714,7 +3067,7 @@ public enum GeneralCargoType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2784,7 +3137,7 @@ public partial class TankerDetails { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum TankerHullConfigurationType { @@ -2800,7 +3153,7 @@ public enum TankerHullConfigurationType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ConditionCargoBallastTanksType { @@ -2816,7 +3169,7 @@ public enum ConditionCargoBallastTanksType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2898,7 +3251,7 @@ public partial class PRE72H { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2968,7 +3321,7 @@ public partial class PoBD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3038,7 +3391,7 @@ public partial class PoBA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3244,7 +3597,7 @@ public partial class Passenger { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum GenderType { @@ -3260,7 +3613,7 @@ public enum GenderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IdentityDocumentType { @@ -3285,7 +3638,7 @@ public enum IdentityDocumentType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3306,7 +3659,7 @@ public partial class NAME { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3327,7 +3680,7 @@ public partial class CrewJoinedShipName { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3386,7 +3739,7 @@ public partial class PortOfCallLast30Days { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3420,7 +3773,7 @@ public partial class InfectedArea { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3454,7 +3807,28 @@ public partial class ValidSanitaryControlExemptionOrCertificate { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class StowawaysJoiningLocations { + + private string stowawaysJoiningLocationField; + + /// + public string StowawaysJoiningLocation { + get { + return this.stowawaysJoiningLocationField; + } + set { + this.stowawaysJoiningLocationField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3500,7 +3874,7 @@ public partial class SanitaryMeasuresDetails { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3549,7 +3923,7 @@ public partial class MDH { private bool sanitaryMeasuresAppliedFieldSpecified; - private SanitaryMeasuresDetails sanitaryMeasuresDetailsField; + private SanitaryMeasuresDetails[] sanitaryMeasuresDetailsField; private bool stowawaysDetectedField; @@ -3557,6 +3931,8 @@ public partial class MDH { private string stowawaysJoiningLocationField; + private StowawaysJoiningLocations[] stowawaysJoiningLocationsField; + private bool sickAnimalOrPetOnBoardField; private bool sickAnimalOrPetOnBoardFieldSpecified; @@ -3575,7 +3951,7 @@ public partial class MDH { private bool infectedAreaVisitedFieldSpecified; - private InfectedArea infectedAreaField; + private InfectedArea[] infectedAreaField; private PortOfCallLast30Days[] portsOfCallLast30DaysField; @@ -3800,7 +4176,8 @@ public partial class MDH { } /// - public SanitaryMeasuresDetails SanitaryMeasuresDetails { + [System.Xml.Serialization.XmlElementAttribute("SanitaryMeasuresDetails")] + public SanitaryMeasuresDetails[] SanitaryMeasuresDetails { get { return this.sanitaryMeasuresDetailsField; } @@ -3840,6 +4217,17 @@ public partial class MDH { } } + /// + [System.Xml.Serialization.XmlElementAttribute("StowawaysJoiningLocations")] + public StowawaysJoiningLocations[] StowawaysJoiningLocations { + get { + return this.stowawaysJoiningLocationsField; + } + set { + this.stowawaysJoiningLocationsField = value; + } + } + /// public bool SickAnimalOrPetOnBoard { get { @@ -3935,7 +4323,8 @@ public partial class MDH { } /// - public InfectedArea InfectedArea { + [System.Xml.Serialization.XmlElementAttribute("InfectedArea")] + public InfectedArea[] InfectedArea { get { return this.infectedAreaField; } @@ -3957,7 +4346,7 @@ public partial class MDH { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3966,12 +4355,18 @@ public partial class INFO { private ShippingAreaType shippingAreaField; + private string portAreaField; + private string requestedPositionInPortOfCallField; private string specialRequirementsOfShipAtBerthField; private string constructionCharacteristicsOfShipField; + private string bowThrusterPowerField; + + private string sternThrusterPowerField; + private bool fumigatedBulkCargoField; private bool fumigatedBulkCargoFieldSpecified; @@ -3990,6 +4385,16 @@ public partial class INFO { } } + /// + public string PortArea { + get { + return this.portAreaField; + } + set { + this.portAreaField = value; + } + } + /// public string RequestedPositionInPortOfCall { get { @@ -4020,6 +4425,26 @@ public partial class INFO { } } + /// + public string BowThrusterPower { + get { + return this.bowThrusterPowerField; + } + set { + this.bowThrusterPowerField = value; + } + } + + /// + public string SternThrusterPower { + get { + return this.sternThrusterPowerField; + } + set { + this.sternThrusterPowerField = value; + } + } + /// public bool FumigatedBulkCargo { get { @@ -4064,7 +4489,7 @@ public partial class INFO { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ShippingAreaType { @@ -4080,7 +4505,7 @@ public enum ShippingAreaType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4101,7 +4526,7 @@ public partial class TIEFD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4122,7 +4547,7 @@ public partial class TIEFA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4291,7 +4716,7 @@ public partial class CrewMember { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4326,7 +4751,7 @@ public partial class CargoCode { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4422,7 +4847,7 @@ public partial class Cargo { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum CargoHandlingType { @@ -4435,7 +4860,7 @@ public enum CargoHandlingType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4481,7 +4906,7 @@ public partial class BunkerFuel { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4514,7 +4939,7 @@ public partial class PortOfItinerary { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4548,7 +4973,7 @@ public partial class BPOL { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4569,7 +4994,7 @@ public partial class ATD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4590,7 +5015,7 @@ public partial class ATA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4623,7 +5048,7 @@ public partial class CallPurpose { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4819,7 +5244,7 @@ public partial class NOA_NOD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4914,6 +5339,8 @@ public partial class Visit { private REG_TRANSIT rEG_TRANSITField; + private AGNT aGNTField; + private ResetNotification[] rESETField; /// @@ -5368,6 +5795,16 @@ public partial class Visit { } } + /// + public AGNT AGNT { + get { + return this.aGNTField; + } + set { + this.aGNTField = value; + } + } + /// [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] public ResetNotification[] RESET { @@ -5381,7 +5818,7 @@ public partial class Visit { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum MessageType { @@ -5394,7 +5831,7 @@ public enum MessageType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5560,7 +5997,7 @@ public partial class ReportingParty { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ReportingPartyType { @@ -5588,7 +6025,7 @@ public enum ReportingPartyType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5646,7 +6083,7 @@ public partial class REG_VISIT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5692,7 +6129,7 @@ public partial class REG_TRANSIT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5773,7 +6210,7 @@ public partial class RequestId { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5797,7 +6234,7 @@ public partial class eDeclarationMessageInterchangeBody { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5819,7 +6256,7 @@ public partial class eDeclarationMessageInterchangeBodyEdiResponseList { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5841,7 +6278,7 @@ public partial class eDeclarationMessageInterchangeBodyRequestIdList { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 8d91bf62..82192967 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.0.7")] +[assembly: AssemblyInformationalVersion("3.0.8")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 5c563b99..62c22fea 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.7.*")] +[assembly: AssemblyVersion("3.0.8.*")] diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs index 71aaf0a8..1cdf5f95 100644 --- a/nsw/Source/bsmd.dbh/Request.cs +++ b/nsw/Source/bsmd.dbh/Request.cs @@ -565,14 +565,11 @@ namespace bsmd.dbh rootStat.PortOfRegistry = stat.PortOfRegistry; rootStat.ShipType = stat.ShipType; rootStat.InmarsatCallNumber = stat.InmarsatCallNumber; - RootSTATTransportMode transportMode; - if(Enum.TryParse(stat.TransportMode, out transportMode)) - { - rootStat.TransportMode = transportMode; - } else - { - _log.WarnFormat("failed to parse transportmode {0}", stat.TransportMode); - } + + rootStat.TransportMode = RootSTATTransportMode.Item1; // default is maritime transport! + if (!stat.TransportMode.IsNullOrEmpty() && stat.TransportMode.Equals("8")) + rootStat.TransportMode = RootSTATTransportMode.Item8; + if (!stat.ISMCompanyName.IsNullOrEmpty()) { rootStat.ISMCompany = new RootSTATISMCompany(); diff --git a/nsw/dakosy/eDeclaration.cs b/nsw/dakosy/eDeclaration.cs index 89382cab..e32c61cd 100644 --- a/nsw/dakosy/eDeclaration.cs +++ b/nsw/dakosy/eDeclaration.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.34209 +// Laufzeitversion:4.0.30319.42000 // // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -11,12 +11,12 @@ using System.Xml.Serialization; // -// This source code was auto-generated by xsd, Version=4.0.30319.33440. +// Dieser Quellcode wurde automatisch generiert von xsd, Version=4.6.1055.0. // /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -63,7 +63,7 @@ public partial class eDeclarationMessage { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -145,7 +145,7 @@ public partial class InterchangeHeaderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -166,7 +166,7 @@ public partial class Participant { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -201,7 +201,7 @@ public partial class ParticipantCode { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -235,7 +235,7 @@ public partial class ErrorInfo { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -293,7 +293,7 @@ public partial class ResponseError { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -338,7 +338,7 @@ public partial class WildCardFreeText { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -384,7 +384,7 @@ public partial class AdditionalValue { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -429,7 +429,7 @@ public partial class CommunicationDataType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -635,7 +635,7 @@ public partial class EdiResponse { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -705,7 +705,7 @@ public partial class MessageHeaderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum EdiResponseType { @@ -724,7 +724,7 @@ public enum EdiResponseType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum EdiResponseSubType { @@ -737,7 +737,7 @@ public enum EdiResponseSubType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -758,7 +758,7 @@ public partial class ResetNotification { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum NotificationType { @@ -834,7 +834,148 @@ public enum NotificationType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class AGNT { + + private string companyNameField; + + private string streetNameField; + + private string streetNumberField; + + private string postalCodeField; + + private string cityField; + + private string countryField; + + private string lastNameField; + + private string firstNameField; + + private string phoneField; + + private string faxField; + + private string eMailField; + + /// + public string CompanyName { + get { + return this.companyNameField; + } + set { + this.companyNameField = value; + } + } + + /// + public string StreetName { + get { + return this.streetNameField; + } + set { + this.streetNameField = value; + } + } + + /// + public string StreetNumber { + get { + return this.streetNumberField; + } + set { + this.streetNumberField = value; + } + } + + /// + public string PostalCode { + get { + return this.postalCodeField; + } + set { + this.postalCodeField = value; + } + } + + /// + public string City { + get { + return this.cityField; + } + set { + this.cityField = value; + } + } + + /// + public string Country { + get { + return this.countryField; + } + set { + this.countryField = value; + } + } + + /// + public string LastName { + get { + return this.lastNameField; + } + set { + this.lastNameField = value; + } + } + + /// + public string FirstName { + get { + return this.firstNameField; + } + set { + this.firstNameField = value; + } + } + + /// + public string Phone { + get { + return this.phoneField; + } + set { + this.phoneField = value; + } + } + + /// + public string Fax { + get { + return this.faxField; + } + set { + this.faxField = value; + } + } + + /// + public string EMail { + get { + return this.eMailField; + } + set { + this.eMailField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -979,7 +1120,7 @@ public partial class Waste { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum WasteType { @@ -1013,7 +1154,7 @@ public enum WasteType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1034,7 +1175,7 @@ public partial class WasteDisposalServiceProviderName { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1182,7 +1323,7 @@ public partial class WAS { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum WasteDisposalDeliveryType { @@ -1198,7 +1339,7 @@ public enum WasteDisposalDeliveryType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1291,7 +1432,7 @@ public partial class ISMCompany { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1322,6 +1463,10 @@ public partial class STAT { private string inmarsatCallNumberField; + private TransportModeType transportModeField; + + private bool transportModeFieldSpecified; + private string shipTypeField; private ISMCompany iSMCompanyField; @@ -1449,6 +1594,27 @@ public partial class STAT { } } + /// + public TransportModeType TransportMode { + get { + return this.transportModeField; + } + set { + this.transportModeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool TransportModeSpecified { + get { + return this.transportModeFieldSpecified; + } + set { + this.transportModeFieldSpecified = value; + } + } + /// public string ShipType { get { @@ -1471,7 +1637,22 @@ public partial class STAT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public enum TransportModeType { + + /// + [System.Xml.Serialization.XmlEnumAttribute("1")] + Item1, + + /// + [System.Xml.Serialization.XmlEnumAttribute("8")] + Item8, +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1576,7 +1757,7 @@ public partial class TOWDOperator { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1708,7 +1889,7 @@ public partial class TowageDeparture { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1813,7 +1994,7 @@ public partial class TOWAOperator { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1969,7 +2150,7 @@ public partial class TowageArrival { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2014,7 +2195,166 @@ public partial class Service { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class ShipToShipActivities { + + private string locationNameField; + + private string locationCodeField; + + private int locationCoordinatesLatitudeField; + + private bool locationCoordinatesLatitudeFieldSpecified; + + private int locationCoordinatesLongitudeField; + + private bool locationCoordinatesLongitudeFieldSpecified; + + private System.DateTime dateFromField; + + private bool dateFromFieldSpecified; + + private System.DateTime dateToField; + + private bool dateToFieldSpecified; + + private string activityTypeField; + + private string securityMattersToReportField; + + /// + public string LocationName { + get { + return this.locationNameField; + } + set { + this.locationNameField = value; + } + } + + /// + public string LocationCode { + get { + return this.locationCodeField; + } + set { + this.locationCodeField = value; + } + } + + /// + public int LocationCoordinatesLatitude { + get { + return this.locationCoordinatesLatitudeField; + } + set { + this.locationCoordinatesLatitudeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LocationCoordinatesLatitudeSpecified { + get { + return this.locationCoordinatesLatitudeFieldSpecified; + } + set { + this.locationCoordinatesLatitudeFieldSpecified = value; + } + } + + /// + public int LocationCoordinatesLongitude { + get { + return this.locationCoordinatesLongitudeField; + } + set { + this.locationCoordinatesLongitudeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool LocationCoordinatesLongitudeSpecified { + get { + return this.locationCoordinatesLongitudeFieldSpecified; + } + set { + this.locationCoordinatesLongitudeFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="date")] + public System.DateTime DateFrom { + get { + return this.dateFromField; + } + set { + this.dateFromField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DateFromSpecified { + get { + return this.dateFromFieldSpecified; + } + set { + this.dateFromFieldSpecified = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="date")] + public System.DateTime DateTo { + get { + return this.dateToField; + } + set { + this.dateToField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool DateToSpecified { + get { + return this.dateToFieldSpecified; + } + set { + this.dateToFieldSpecified = value; + } + } + + /// + public string ActivityType { + get { + return this.activityTypeField; + } + set { + this.activityTypeField = value; + } + } + + /// + public string SecurityMattersToReport { + get { + return this.securityMattersToReportField; + } + set { + this.securityMattersToReportField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2173,7 +2513,7 @@ public partial class ShipToShipActivitiesDuringLastTenPortFacilitiesCalled { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2319,7 +2659,7 @@ public partial class LastTenPortFacilitiesCalled { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2380,6 +2720,8 @@ public partial class SEC { private ShipToShipActivitiesDuringLastTenPortFacilitiesCalled[] shipToShipActivitiesDuringLastTenPortFacilitiesCalledField; + private ShipToShipActivities[] shipToShipActivitiesField; + /// public bool SecSimplification { get { @@ -2660,10 +3002,21 @@ public partial class SEC { this.shipToShipActivitiesDuringLastTenPortFacilitiesCalledField = value; } } + + /// + [System.Xml.Serialization.XmlElementAttribute("ShipToShipActivities")] + public ShipToShipActivities[] ShipToShipActivities { + get { + return this.shipToShipActivitiesField; + } + set { + this.shipToShipActivitiesField = value; + } + } } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IsscType { @@ -2676,7 +3029,7 @@ public enum IsscType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IsscIssuerType { @@ -2689,7 +3042,7 @@ public enum IsscIssuerType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum GeneralCargoType { @@ -2714,7 +3067,7 @@ public enum GeneralCargoType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2784,7 +3137,7 @@ public partial class TankerDetails { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum TankerHullConfigurationType { @@ -2800,7 +3153,7 @@ public enum TankerHullConfigurationType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ConditionCargoBallastTanksType { @@ -2816,7 +3169,7 @@ public enum ConditionCargoBallastTanksType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2898,7 +3251,7 @@ public partial class PRE72H { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -2968,7 +3321,7 @@ public partial class PoBD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3038,7 +3391,7 @@ public partial class PoBA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3244,7 +3597,7 @@ public partial class Passenger { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum GenderType { @@ -3260,7 +3613,7 @@ public enum GenderType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum IdentityDocumentType { @@ -3285,7 +3638,7 @@ public enum IdentityDocumentType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3306,7 +3659,7 @@ public partial class NAME { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3327,7 +3680,7 @@ public partial class CrewJoinedShipName { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3386,7 +3739,7 @@ public partial class PortOfCallLast30Days { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3420,7 +3773,7 @@ public partial class InfectedArea { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3454,7 +3807,28 @@ public partial class ValidSanitaryControlExemptionOrCertificate { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] +public partial class StowawaysJoiningLocations { + + private string stowawaysJoiningLocationField; + + /// + public string StowawaysJoiningLocation { + get { + return this.stowawaysJoiningLocationField; + } + set { + this.stowawaysJoiningLocationField = value; + } + } +} + +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3500,7 +3874,7 @@ public partial class SanitaryMeasuresDetails { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3549,7 +3923,7 @@ public partial class MDH { private bool sanitaryMeasuresAppliedFieldSpecified; - private SanitaryMeasuresDetails sanitaryMeasuresDetailsField; + private SanitaryMeasuresDetails[] sanitaryMeasuresDetailsField; private bool stowawaysDetectedField; @@ -3557,6 +3931,8 @@ public partial class MDH { private string stowawaysJoiningLocationField; + private StowawaysJoiningLocations[] stowawaysJoiningLocationsField; + private bool sickAnimalOrPetOnBoardField; private bool sickAnimalOrPetOnBoardFieldSpecified; @@ -3575,7 +3951,7 @@ public partial class MDH { private bool infectedAreaVisitedFieldSpecified; - private InfectedArea infectedAreaField; + private InfectedArea[] infectedAreaField; private PortOfCallLast30Days[] portsOfCallLast30DaysField; @@ -3800,7 +4176,8 @@ public partial class MDH { } /// - public SanitaryMeasuresDetails SanitaryMeasuresDetails { + [System.Xml.Serialization.XmlElementAttribute("SanitaryMeasuresDetails")] + public SanitaryMeasuresDetails[] SanitaryMeasuresDetails { get { return this.sanitaryMeasuresDetailsField; } @@ -3840,6 +4217,17 @@ public partial class MDH { } } + /// + [System.Xml.Serialization.XmlElementAttribute("StowawaysJoiningLocations")] + public StowawaysJoiningLocations[] StowawaysJoiningLocations { + get { + return this.stowawaysJoiningLocationsField; + } + set { + this.stowawaysJoiningLocationsField = value; + } + } + /// public bool SickAnimalOrPetOnBoard { get { @@ -3935,7 +4323,8 @@ public partial class MDH { } /// - public InfectedArea InfectedArea { + [System.Xml.Serialization.XmlElementAttribute("InfectedArea")] + public InfectedArea[] InfectedArea { get { return this.infectedAreaField; } @@ -3957,7 +4346,7 @@ public partial class MDH { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -3966,12 +4355,18 @@ public partial class INFO { private ShippingAreaType shippingAreaField; + private string portAreaField; + private string requestedPositionInPortOfCallField; private string specialRequirementsOfShipAtBerthField; private string constructionCharacteristicsOfShipField; + private string bowThrusterPowerField; + + private string sternThrusterPowerField; + private bool fumigatedBulkCargoField; private bool fumigatedBulkCargoFieldSpecified; @@ -3990,6 +4385,16 @@ public partial class INFO { } } + /// + public string PortArea { + get { + return this.portAreaField; + } + set { + this.portAreaField = value; + } + } + /// public string RequestedPositionInPortOfCall { get { @@ -4020,6 +4425,26 @@ public partial class INFO { } } + /// + public string BowThrusterPower { + get { + return this.bowThrusterPowerField; + } + set { + this.bowThrusterPowerField = value; + } + } + + /// + public string SternThrusterPower { + get { + return this.sternThrusterPowerField; + } + set { + this.sternThrusterPowerField = value; + } + } + /// public bool FumigatedBulkCargo { get { @@ -4064,7 +4489,7 @@ public partial class INFO { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ShippingAreaType { @@ -4080,7 +4505,7 @@ public enum ShippingAreaType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4101,7 +4526,7 @@ public partial class TIEFD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4122,7 +4547,7 @@ public partial class TIEFA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4291,7 +4716,7 @@ public partial class CrewMember { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4326,7 +4751,7 @@ public partial class CargoCode { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4422,7 +4847,7 @@ public partial class Cargo { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum CargoHandlingType { @@ -4435,7 +4860,7 @@ public enum CargoHandlingType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4481,7 +4906,7 @@ public partial class BunkerFuel { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4514,7 +4939,7 @@ public partial class PortOfItinerary { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4548,7 +4973,7 @@ public partial class BPOL { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4569,7 +4994,7 @@ public partial class ATD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4590,7 +5015,7 @@ public partial class ATA { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4623,7 +5048,7 @@ public partial class CallPurpose { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4819,7 +5244,7 @@ public partial class NOA_NOD { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -4914,6 +5339,8 @@ public partial class Visit { private REG_TRANSIT rEG_TRANSITField; + private AGNT aGNTField; + private ResetNotification[] rESETField; /// @@ -5368,6 +5795,16 @@ public partial class Visit { } } + /// + public AGNT AGNT { + get { + return this.aGNTField; + } + set { + this.aGNTField = value; + } + } + /// [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)] public ResetNotification[] RESET { @@ -5381,7 +5818,7 @@ public partial class Visit { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum MessageType { @@ -5394,7 +5831,7 @@ public enum MessageType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5560,7 +5997,7 @@ public partial class ReportingParty { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://e-declaration.dakosy.de/EdiMessages")] public enum ReportingPartyType { @@ -5588,7 +6025,7 @@ public enum ReportingPartyType { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5646,7 +6083,7 @@ public partial class REG_VISIT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5692,7 +6129,7 @@ public partial class REG_TRANSIT { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5773,7 +6210,7 @@ public partial class RequestId { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5797,7 +6234,7 @@ public partial class eDeclarationMessageInterchangeBody { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5819,7 +6256,7 @@ public partial class eDeclarationMessageInterchangeBodyEdiResponseList { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -5841,7 +6278,7 @@ public partial class eDeclarationMessageInterchangeBodyRequestIdList { } /// -[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.33440")] +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")]