From fb436f853688d09bc7c1359724549aa279f3cbdb Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 27 Apr 2016 18:58:06 +0000 Subject: [PATCH] =?UTF-8?q?3.0.13=20/=203.0.14=20Korrekturen=20nach=20Test?= =?UTF-8?q?s=20f=C3=BCr=20den=20Versand=20HIS-Nord=20und=20Dakosy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Stundensheet.xlsx | Bin 21700 -> 21764 bytes nsw/Source/bsmd.dakosy/Request.cs | 63 +++++++++++++----- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.hisnord/Request.cs | 52 +++++++++++---- nsw/Source/bsmd.hisnord/readme.txt | 4 +- 6 files changed, 90 insertions(+), 33 deletions(-) diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index ea1210b85a5072cf4742dd4acdf0b0c9da3cc355..b93f4b40865a4d04279f4c37c6cf87e9e35d336a 100644 GIT binary patch delta 10451 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 0) ? agnt.AgentStreetAndNumber.Substring(lastBlank) : ""; - if ((lastBlank > 0) && (number.Length > 0) && (Char.IsNumber(number[0]))) + if (agnt.AgentStreetAndNumber != null) { - 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 = ""; + 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; @@ -282,11 +285,11 @@ namespace bsmd.dakosy vList.Visit[0].CREW[i].FirstName = crew.CrewMemberFirstName; vList.Visit[0].CREW[i].GenderSpecified = crew.CrewMemberGender.HasValue; byte gender = crew.CrewMemberGender ?? 0; - vList.Visit[0].CREW[i].Gender = (GenderType)gender; + vList.Visit[0].CREW[i].Gender = (gender == 1) ? GenderType.FEMALE : GenderType.MALE; vList.Visit[0].CREW[i].IdentityDocumentId = crew.CrewMemberIdentityDocumentId; vList.Visit[0].CREW[i].IdentityDocumentTypeSpecified = crew.CrewMemberIdentityDocumentType.HasValue; byte dType = crew.CrewMemberIdentityDocumentType ?? 0; - vList.Visit[0].CREW[i].IdentityDocumentType = (IdentityDocumentType)dType; + vList.Visit[0].CREW[i].IdentityDocumentType = CrewDocumentFromNSWEnumeration(dType); vList.Visit[0].CREW[i].LastName = crew.CrewMemberLastName; vList.Visit[0].CREW[i].Nationality = crew.CrewMemberNationality; vList.Visit[0].CREW[i].PlaceOfBirth = crew.CrewMemberPlaceOfBirth; @@ -433,11 +436,11 @@ namespace bsmd.dakosy vList.Visit[0].PAS[i].FirstName = pas.PassengerFirstName; vList.Visit[0].PAS[i].GenderSpecified = pas.PassengerGender.HasValue; if (pas.PassengerGender.HasValue) - vList.Visit[0].PAS[i].Gender = (GenderType)pas.PassengerGender.Value; + vList.Visit[0].PAS[i].Gender = (pas.PassengerGender.Value == 1) ? GenderType.FEMALE : GenderType.MALE; vList.Visit[0].PAS[i].IdentityDocumentId = pas.PassengerIdentityDocumentId; vList.Visit[0].PAS[i].IdentityDocumentTypeSpecified = pas.PassengerIdentityDocumentType.HasValue; if (pas.PassengerIdentityDocumentType.HasValue) - vList.Visit[0].PAS[i].IdentityDocumentType = (IdentityDocumentType)pas.PassengerIdentityDocumentType.Value; + vList.Visit[0].PAS[i].IdentityDocumentType = CrewDocumentFromNSWEnumeration(pas.PassengerIdentityDocumentType.Value); vList.Visit[0].PAS[i].InTransitSpecified = pas.PassengerInTransit.HasValue; if (pas.PassengerInTransit.HasValue) vList.Visit[0].PAS[i].InTransit = pas.PassengerInTransit.Value; @@ -536,8 +539,7 @@ namespace bsmd.dakosy vList.Visit[0].SEC.PortFacilityOfArrival = sec.PortFacilityOfArrival; vList.Visit[0].SEC.GeneralDescriptionOfCargoSpecified = sec.GeneralDescriptionOfCargo.HasValue; byte gdc = sec.GeneralDescriptionOfCargo ?? 0; - vList.Visit[0].SEC.GeneralDescriptionOfCargo = (GeneralCargoType)gdc; - if (sec.LastTenPortFacilitesCalled.Count > 0) + vList.Visit[0].SEC.GeneralDescriptionOfCargo = CargoTypeFromNSWEnumeration(gdc); if (sec.LastTenPortFacilitesCalled.Count > 0) { vList.Visit[0].SEC.LastTenPortFacilitiesCalled = new LastTenPortFacilitiesCalled[sec.LastTenPortFacilitesCalled.Count]; for (int i = 0; i < sec.LastTenPortFacilitesCalled.Count; i++) @@ -950,5 +952,34 @@ namespace bsmd.dakosy #endregion + static IdentityDocumentType CrewDocumentFromNSWEnumeration(byte nswValue) + { + switch(nswValue) + { + case 0: return IdentityDocumentType.IDENTITY_CARD; + case 1: return IdentityDocumentType.PASSPORT; + case 2: return IdentityDocumentType.MUSTER_BOOK; + case 3: return IdentityDocumentType.PICTURE_ID; + case 4: return IdentityDocumentType.RESIDENTAL_PERMIT; + default: + return IdentityDocumentType.OTHER_LEGAL_IDENTITY_DOCUMENT; + } + } + + static GeneralCargoType CargoTypeFromNSWEnumeration(byte nswValue) + { + switch(nswValue) + { + case 0: return GeneralCargoType.CONTAINER; + case 1: return GeneralCargoType.VEHICLES; + case 2: return GeneralCargoType.CONVENTIONAL_GENERAL_CARGO; + case 3: return GeneralCargoType.DRY_CARGO_IN_BULK; + case 4: return GeneralCargoType.LIQUID_CARGO_IN_BULK; + case 5: + default: + return GeneralCargoType.EMPTY; + } + } + } } diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 26fa7ac4..9c96b24d 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.12")] +[assembly: AssemblyInformationalVersion("3.0.14")] [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 237a801a..05350d34 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.12.*")] +[assembly: AssemblyVersion("3.0.14.*")] diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs index e5e42415..e30860f3 100644 --- a/nsw/Source/bsmd.hisnord/Request.cs +++ b/nsw/Source/bsmd.hisnord/Request.cs @@ -102,6 +102,28 @@ namespace bsmd.hisnord if (messages[0].MessageCore.IsTransit) visitTransitHeader = message; break; + #region AGNT + + case Message.NotificationClass.AGNT: + if (message.Elements.Count > 0) + { + AGNT agnt = message.Elements[0] as AGNT; + _nsw.conveyance.AGNT = new global::agnt(); + _nsw.conveyance.AGNT.AgentCity = agnt.AgentCity; + _nsw.conveyance.AGNT.AgentCompanyName = agnt.AgentCompanyName; + _nsw.conveyance.AGNT.AgentCountry = agnt.AgentCountry; + _nsw.conveyance.AGNT.AgentEMail = agnt.AgentEMail; + _nsw.conveyance.AGNT.AgentFax = agnt.AgentFax; + _nsw.conveyance.AGNT.AgentFirstName = agnt.AgentFirstName; + _nsw.conveyance.AGNT.AgentLastName = agnt.AgentLastName; + _nsw.conveyance.AGNT.AgentPhone = agnt.AgentPhone; + _nsw.conveyance.AGNT.AgentPostalCode = agnt.AgentPostalCode; + _nsw.conveyance.AGNT.AgentStreetAndNumber = agnt.AgentStreetAndNumber; + } + break; + + #endregion + #region ATA/ATD case Message.NotificationClass.ATA: if (message.MessageCore.Incoming) @@ -596,6 +618,7 @@ namespace bsmd.hisnord _nsw.conveyance.Info.FumigatedBulkCargo = (info.FumigatedBulkCargo.Value == 1) ? yorntype.Y : yorntype.N; else _nsw.conveyance.Info.FumigatedBulkCargo = yorntype.N; + _nsw.conveyance.Info.PortArea = info.PortArea; _nsw.conveyance.Info.RequestedPositionInPortOfCall = info.RequestedPositionInPortOfCall; if (info.ShippingArea.HasValue) _nsw.conveyance.Info.ShippingArea = (shippingareatype)info.ShippingArea.Value; @@ -641,8 +664,8 @@ namespace bsmd.hisnord if (mdh.AwareOfFurtherInfections.HasValue) _mdh.AwareOfConditionsForFurtherInfections = mdh.AwareOfFurtherInfections.Value ? yorntype.Y : yorntype.N; - if (mdh.InfectedAreas.Count > 0) - { + // if (mdh.InfectedAreas.Count > 0) + // { _mdh.InfectedAreas = new infectedarea[mdh.InfectedAreas.Count]; for (int i = 0; i < mdh.InfectedAreas.Count; i++) { @@ -651,10 +674,12 @@ namespace bsmd.hisnord _mdh.InfectedAreas[i].InfectedAreaDate = mdh.InfectedAreas[i].InfectedAreaDate.Value; _mdh.InfectedAreas[i].InfectedAreaPort = mdh.InfectedAreas[i].InfectedAreaPort; } - } + // } if (mdh.InfectedAreaVisited.HasValue) - _mdh.InfectedAreaVisited = mdh.InfectedAreaVisited.Value ? yorntype.Y : yorntype.N; + _mdh.InfectedAreaVisited = mdh.InfectedAreaVisited ?? false ? yorntype.Y : yorntype.N; + + if (mdh.MedicalConsulted.HasValue) _mdh.MedicalConsulted = mdh.MedicalConsulted.Value ? yorntype.Y : yorntype.N; if (mdh.NonAccidentalDeathsDuringVoyage.HasValue) @@ -665,8 +690,8 @@ namespace bsmd.hisnord _mdh.NumberOfIllPersons = mdh.NumberOfIllPersons.Value.ToString(); if (mdh.NumberOfIllPersonsHigherThanExpected.HasValue) _mdh.NumberOfIllPersonsHigherThanExpected = mdh.NumberOfIllPersonsHigherThanExpected.Value ? yorntype.Y : yorntype.N; - if (mdh.PortOfCallLast30Days.Count > 0) - { + // if (mdh.PortOfCallLast30Days.Count > 0) + // { _mdh.PortsOfCallLast30Days = new portofcallmdh[mdh.PortOfCallLast30Days.Count]; for (int i = 0; i < mdh.PortOfCallLast30Days.Count; i++) { @@ -686,14 +711,14 @@ namespace bsmd.hisnord _mdh.PortsOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysDateOfDeparture.Value; _mdh.PortsOfCallLast30Days[i].PortOfCallLast30DaysLocode = mdh.PortOfCallLast30Days[i].PortOfCallLast30DaysLocode; } - } + // } if (mdh.SanitaryControlReinspectionRequired.HasValue) _mdh.SanitaryControlReinspectionRequired = mdh.SanitaryControlReinspectionRequired.Value ? yorntype.Y : yorntype.N; if (mdh.SanitaryMeasuresApplied.HasValue) _mdh.SanitaryMeasuresApplied = mdh.SanitaryMeasuresApplied.Value ? yorntype.Y : yorntype.N; - if (mdh.SanitaryMeasuresDetails.Count > 0) - { + // if (mdh.SanitaryMeasuresDetails.Count > 0) + // { _mdh.SanitaryMeasuresDetails = new sanitarydetail[mdh.SanitaryMeasuresDetails.Count]; for (int i = 0; i < mdh.SanitaryMeasuresDetails.Count; i++) { @@ -703,21 +728,21 @@ namespace bsmd.hisnord _mdh.SanitaryMeasuresDetails[i].SanitaryMeasuresLocation = mdh.SanitaryMeasuresDetails[i].SanitaryMeasuresLocation; _mdh.SanitaryMeasuresDetails[i].SanitaryMeasuresType = mdh.SanitaryMeasuresDetails[i].SanitaryMeasuresType; } - } + // } if (mdh.SickAnimalOrPetOnBoard.HasValue) _mdh.SickAnimalOrPetOnBoard = mdh.SickAnimalOrPetOnBoard.Value ? yorntype.Y : yorntype.N; if (mdh.SickPersonsOnBoard.HasValue) _mdh.SickPersonOnBoard = mdh.SickPersonsOnBoard.Value ? yorntype.Y : yorntype.N; _mdh.StowawaysDetected = (mdh.StowawaysDetected ?? false) ? yorntype.Y : yorntype.N; - if ((_mdh.StowawaysDetected == yorntype.Y) && (mdh.StowawaysJoiningLocations.Count > 0)) - { + // if ((_mdh.StowawaysDetected == yorntype.Y) && (mdh.StowawaysJoiningLocations.Count > 0)) + // { _mdh.StowawayJoiningLocations = new string[mdh.StowawaysJoiningLocations.Count]; for (int i = 0; i < mdh.StowawaysJoiningLocations.Count; i++) { _mdh.StowawayJoiningLocations[i] = mdh.StowawaysJoiningLocations[i].StowawayJoiningLocation; } - } + // } if (mdh.SuspisionInfectiousNature.HasValue) _mdh.SuspisionInfectiousNature = mdh.SuspisionInfectiousNature.Value ? yorntype.Y : yorntype.N; @@ -1072,6 +1097,7 @@ namespace bsmd.hisnord _nsw.conveyance.vessel.MMSINumber = stat.MMSINumber; _nsw.conveyance.vessel.PortOfRegistry = stat.PortOfRegistry; _nsw.conveyance.vessel.ShipName = stat.ShipName; + _nsw.conveyance.vessel.TransportMode = stat.TransportMode; _nsw.conveyance.vessel.ShipType = stat.ShipType; break; #endregion diff --git a/nsw/Source/bsmd.hisnord/readme.txt b/nsw/Source/bsmd.hisnord/readme.txt index e16f036b..6b2bd0a8 100644 --- a/nsw/Source/bsmd.hisnord/readme.txt +++ b/nsw/Source/bsmd.hisnord/readme.txt @@ -100,12 +100,12 @@ o Falls was beim Import in unsere Datenbank bzw. beim Senden an das NSW schief · Grundsätzlich orientiert sich das an Ihnen überreichte XML-Schema an diesen Vorgaben mit folgenden Abweichungen Meldetypen - + Abweichungen NOA_NOD - In IMPORT, EXPORT, TRANSIT vorkommend, + In IMPORT, EXPORT, TRANSIT vorkommend, wobei zusätzlich Hafengebiet oder GISIS-Code gemeldet werden kann, ansonsten wird das Standard-Hafengebiet genommen, z.B. ÜSH für Überseehafen Rostock ATA/ATD