From 70febee15d1025479b5a51900114861decf0d0a3 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 29 Jan 2025 14:27:45 +0100 Subject: [PATCH] MS --- Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb | 4 ++++ Windream/Helpers.vb | 6 +++++- Windream/Windream.vb | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb index 9c74d35f..45896b17 100644 --- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -168,7 +168,11 @@ Public Class ImportZUGFeRDFiles Dim oEmailDataBase = _email.GetEmailDataForMessageId(oMessageId) Try + Dim oInNdex = 0 For Each oFile In oFileGroupFiles + '---------------------------- + '---------------------------- + 'Hier Logik für xml/xRechnungs-Handling - paralleler Zweig zu ProcessFile Dim oResult As ProcessFileResult = ProcessFile(oMessageId, oEmailDataBase, oZUGFeRDCount, oFile, oConnections, oArgs) If oResult.ZugferdFileFound = True Then diff --git a/Windream/Helpers.vb b/Windream/Helpers.vb index fb9aaa83..ba2e3bc6 100644 --- a/Windream/Helpers.vb +++ b/Windream/Helpers.vb @@ -27,6 +27,10 @@ Public Class Helpers 'Umwandeln in String myArray(0) = CStr(pValue) Return myArray + Case 8204 'auch INDEX_TYPE_VECTOR_STRING + 'Umwandeln in String + myArray(0) = CStr(pValue) + Return myArray Case INDEX_TYPE_VECTOR_INTEGER '4098 'Umwandeln in Integer myArray(0) = CInt(pValue.Replace(" ", "")) @@ -65,7 +69,7 @@ Public Class Helpers Friend Shared Function ConvertIndexValue(Type As Integer, pValue As String) As Object ' Leerzeichen an Anfang und Ende entfernen - If Type > 4095 And Type < 4115 Then + If Type > 4095 Then Return ConvertVectorType(Type, pValue) End If pValue = pValue.Trim() diff --git a/Windream/Windream.vb b/Windream/Windream.vb index 8bb5ad0d..df3eb9d5 100644 --- a/Windream/Windream.vb +++ b/Windream/Windream.vb @@ -1286,7 +1286,7 @@ Public Class Windream _logger.Warn(ex.Message) Return False End Try - _logger.Debug("SetFileIndex '{0}' ... ", IndexName) + If LockObject(oWMObject, WMObjectEditModeIndexEdit) = False Then _logger.Warn("File {0} could not be locked") Return False @@ -1300,7 +1300,7 @@ Public Class Windream Dim oType As Integer = GetIndexType(IndexName) Dim oConvertedValues As New List(Of String) Dim oArray As Object - + _logger.Debug("SetFileIndexLoS '{0}' - Indextype: {1} ... ", IndexName, oType) ReDim oArray(Values.Count - 1) For oIndex = 0 To Values.Count - 1