AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Jobs: Procedure-Aufruf mit SQL-Transaction

Browse Source
This commit is contained in:
PitzM
2024-04-23 11:38:53 +02:00
parent 4814758a49
commit 95a40c9f4d
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Jobs/ZUGFeRD/EmailFunctions.vb
View File

@@ -1,11 +1,12 @@
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Base
Imports System.Collections.Generic
Imports System.Data
Imports System.IO
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles
Imports System.Data.SqlClient
Imports System.Collections.Generic
Imports System.Text.RegularExpressions
Imports FirebirdSql.Data
Namespace ZUGFeRD
Public Class EmailFunctions
@@ -26,6 +27,7 @@ Namespace ZUGFeRD
''' TODO we have no information about the language of the receiver at the moment
''' </summary>
''' <param name="pMessageId">E-Mail Message ID</param>
''' <param name="pTransaction">DB Transaction</param>
''' <param name="pBodyText">Body Text</param>
''' <param name="pEmailData">Email Data object</param>
''' <param name="pSourceProcedure">Exception Title</param>
@@ -35,7 +37,7 @@ Namespace ZUGFeRD
''' <param name="pErrorCode">Error Code</param>
''' <param name="pParameter1">Zusätzlicher Parameter 1</param>
''' <param name="pParameter2">Zusätzlicher Parameter 2</param>
Public Sub AddToEmailQueueMSSQL(pMessageId As String, pBodyText As String, pEmailData As EmailData, pSourceProcedure As String,
Public Sub AddToEmailQueueMSSQL(pMessageId As String, pTransaction As SqlTransaction, pBodyText As String, pEmailData As EmailData, pSourceProcedure As String,
pEmailAccountId As Integer, pNamePortal As String, pTemplateId As Integer, pErrorCode As ErrorCode,
pParameter1 As String, pParameter2 As String)
@@ -92,7 +94,7 @@ Namespace ZUGFeRD
AddToEmailQueueMSSQL(pMessageId, pBodyText, pEmailData, pSourceProcedure, pEmailAccountId, pNamePortal)
Else
_logger.Debug("New rejection mail logic is configured!")
AddToEmailQueueMSSQL(pMessageId, pTemplateId, oErrorCode, pEmailAccountId, pParameter1, pParameter2)
AddToEmailQueueMSSQL(pMessageId, pTransaction, pTemplateId, oErrorCode, pEmailAccountId, pParameter1, pParameter2)
End If
End Sub
@@ -103,12 +105,13 @@ Namespace ZUGFeRD
''' for sending rejection mail.
''' </summary>
''' <param name="pMessageId">E-Mail Message ID</param>
''' <param name="pTransaction">DB Transaction</param>
''' <param name="pTemplateId">GUID for TBDD_EMAIL_TEMPLATE from config</param>
''' <param name="pErrorCode">ErrorID (TBDD_GUI_LANGUAGE_PHRASE)</param>
''' <param name="pEmailAccountId">Sending profile from config</param>
''' <param name="pParameter1">Zusätzlicher Parameter 1</param>
''' <param name="pParameter2">Zusätzlicher Parameter 2</param>
Private Sub AddToEmailQueueMSSQL(pMessageId As String, pTemplateId As Integer, pErrorCode As String, pEmailAccountId As Integer,
Private Sub AddToEmailQueueMSSQL(pMessageId As String, pTransaction As SqlTransaction, pTemplateId As Integer, pErrorCode As String, pEmailAccountId As Integer,
pParameter1 As String, pParameter2 As String)
If pParameter1.IsNullOrEmpty Then
@@ -133,11 +136,10 @@ Namespace ZUGFeRD
, '{pErrorCode}'
, '{pParameter1}'
, '{pParameter2}'
, 77
"
If _mssql.ExecuteNonQuery(oExecute) = False Then
_logger.Warn("Could not execute PRDD_SEND_REJECTION_MAIL. See error log!")
End If
, 77"
_mssql.ExecuteNonQuery(oExecute, pTransaction)
Catch ex As Exception
_logger.Error(ex)
End Try