diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb index b95b0000..cf731e27 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb @@ -83,6 +83,7 @@ Public Class cRelayHub Public Class cRelayHubAdditionalSettings Public Property combineOptions As List(Of String) + Public Property combineItemsPriorityDocumentType As String End Class Public Class cRelayHubJobOrderRequest @@ -292,18 +293,29 @@ Public Class cRelayHub ' AdditionalSettings -> combineOptions: nur erlaubte Keys, distinct, lower-case Dim allowed As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) From { - "description", "commodity_code", "country_of_origin", "unit_type" - } + "description", "commodity_code", "country_of_origin", "unit_type" + } - If req.additionalSettings IsNot Nothing AndAlso req.additionalSettings.combineOptions IsNot Nothing Then - Dim cleaned = req.additionalSettings.combineOptions. - Where(Function(o) Not String.IsNullOrWhiteSpace(o)). - Select(Function(o) o.Trim().ToLowerInvariant()). - Where(Function(o) allowed.Contains(o)). - Distinct(). - ToList() + If req.additionalSettings IsNot Nothing Then + + If req.additionalSettings.combineOptions IsNot Nothing Then + Dim cleaned = req.additionalSettings.combineOptions. + Where(Function(o) Not String.IsNullOrWhiteSpace(o)). + Select(Function(o) o.Trim().ToLowerInvariant()). + Where(Function(o) allowed.Contains(o)). + Distinct(). + ToList() + + req.additionalSettings.combineOptions = cleaned + End If + + req.additionalSettings.combineItemsPriorityDocumentType = + If(req.additionalSettings.combineItemsPriorityDocumentType, "").Trim() + + If req.additionalSettings.combineItemsPriorityDocumentType = "" Then + req.additionalSettings.combineItemsPriorityDocumentType = Nothing + End If - req.additionalSettings.combineOptions = cleaned End If Return req