ms

Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -73,11 +73,11 @@ Public Class ImportZUGFeRDFiles
                 _logger.Warn("Got no results for MessageId {0}", MessageId)
                 Return Nothing
             ElseIf oDatatable.Rows.Count > 1 Then
-                _logger.Warn("Got too many results for MessageId {0}. Using first row.", MessageId)
+                _logger.Warn("Got too many results for MessageId {0}. Using last row.", MessageId)
             End If
 
             _logger.Debug("Got Email Data for FileId {0}", MessageId)
-            oRow = oDatatable.Rows.Item(0)
+            oRow = oDatatable.Rows.Item(oDatatable.Rows.Count - 1)
 
             Return New EmailData() With {
                 .From = oRow.Item("EMAIL_FROM"),
@@ -204,8 +204,8 @@ Public Class ImportZUGFeRDFiles
             _logger.Error(ex)
         End Try
     End Sub
-    Private Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, EmailData As EmailData, SourceProcedure As String)
-        If EmailData Is Nothing Then
+    Private Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String)
+        If pEmailData Is Nothing Then
             _logger.Warn("EmailData is empty. Email will not be sent!")
             Exit Sub
         End If
@@ -219,8 +219,14 @@ Public Class ImportZUGFeRDFiles
             Dim oCreatedWho = "ZUGFeRD Service"
             Dim oFinalBodyText = String.Format(EMAIL_WRAPPING_TEXT, BodyText)
 
-            Dim oEmailAddress = EmailData.From
-            Dim oAttachment = EmailData.Attachment
+            Dim oEmailAddress = pEmailData.From
+            Dim oAttachment = pEmailData.Attachment
+            If oAttachment <> String.Empty Then
+                _logger.Debug($"Attachment_String [{oAttachment}]!")
+                If IO.File.Exists(oAttachment) = False Then
+                    _logger.Info($"Attachment.File [{oAttachment}] is not existing!!!")
+                End If
+            End If
 
             If IsNothing(oEmailAddress) OrElse String.IsNullOrWhiteSpace(oEmailAddress) Then
                 _logger.Warn("Could not find email-address for MessageId {0}", MessageId)
@@ -251,7 +257,8 @@ Public Class ImportZUGFeRDFiles
                        ,[EMAIL_SUBJ]
                        ,[EMAIL_BODY]
                        ,[COMMENT]
-                       ,[ADDED_WHO])
+                       ,[ADDED_WHO]
+                        ,EMAIL_ATTMT1)
                  VALUES
                        (77
                        ,{oAccountId}
@@ -262,7 +269,8 @@ Public Class ImportZUGFeRDFiles
                        ,'{oSubject}'
                        ,'{oFinalBodyText}'
                        ,'{SourceProcedure}'
-                       ,'{oCreatedWho}')"
+                       ,'{oCreatedWho}'
+                       ,'{oAttachment}')"
                 _mssql.ExecuteNonQuery(oInsert)
             Else
                 'If oDTResult.Rows.Count = 0 Then
@@ -423,7 +431,7 @@ Public Class ImportZUGFeRDFiles
                                             End Try
                                             If oRejected = False Then
                                                 HISTORY_ID = oMD5DT.Rows(0).Item("GUID")
-                                                Throw New MD5HashException()
+                                                Throw New MD5HashException($"There is already an identical invoice! - HistoryID [{HISTORY_ID}]")
                                             Else
                                                 _logger.Info("ZuGFeRDFile already has been worked, but formerly obviously was rejected!")
                                             End If