AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: AppStd:ee58242a380228c9f95a7db3065c822a73bc421a
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign
...
compare: AppStd:f90ea3133dbb28192b4c4d33b04199d50d3867ea
Branches Tags
AppStd:master AppStd:upgrade-to-NET8-1 AppStd:Monorepo-Update-.NET-8 AppStd:Newest-GDPictureVersion AppStd:ZugferdService-Redesign

2 Commits
ee58242a38 ... f90ea3133d

Author SHA1 Message Date
Jonathan Jenne
f90ea3133d Jobs: Version 1.6.5 2021-07-09 14:23:07 +02:00
Jonathan Jenne
345277cae7 Jobs: Open new connection for history entries 2021-07-09 14:22:41 +02:00
2 changed files with 6 additions and 4 deletions
Expand all files Collapse all files

6
Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
View File

@@ -661,11 +661,12 @@ Public Class ImportZUGFeRDFiles
Private Function Create_HistoryEntry(MessageId As String, MD5Checksum As String, Message As String, Transaction As FbTransaction) As Boolean Private Function Create_HistoryEntry(MessageId As String, MD5Checksum As String, Message As String, Transaction As FbTransaction) As Boolean
Try Try
Dim oConnection = _firebird.GetConnection()
Dim oSQL = $"INSERT INTO TBEDM_ZUGFERD_HISTORY_IN (COMMENT, MD5HASH, MESSAGE_ID) VALUES ('{Message}', '{MD5Checksum}', '{MessageId}')" Dim oSQL = $"INSERT INTO TBEDM_ZUGFERD_HISTORY_IN (COMMENT, MD5HASH, MESSAGE_ID) VALUES ('{Message}', '{MD5Checksum}', '{MessageId}')"
' 09.07.2021: This can't be in the transaction since the history ' 09.07.2021: This can't be in the transaction since the history
' entry needs to be accessed by MoveAndRenameEmailToRejected shortly after ' entry needs to be accessed by MoveAndRenameEmailToRejected shortly after
_firebird.ExecuteNonQueryWithConnection(oSQL, Transaction.Connection, Firebird.TransactionMode.NoTransaction) _firebird.ExecuteNonQueryWithConnection(oSQL, oConnection, Firebird.TransactionMode.WithTransaction)
Return True Return True
Catch ex As Exception Catch ex As Exception
@@ -678,8 +679,9 @@ Public Class ImportZUGFeRDFiles
Private Function Update_HistoryEntry(MessageId As String, MD5Checksum As String, Message As String, Transaction As FbTransaction) As Boolean Private Function Update_HistoryEntry(MessageId As String, MD5Checksum As String, Message As String, Transaction As FbTransaction) As Boolean
Try Try
Dim oConnection = _firebird.GetConnection()
Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = '{Message}' WHERE MD5HASH = '{MD5Checksum}' AND MESSAGE_ID = '{MessageId}'" Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = '{Message}' WHERE MD5HASH = '{MD5Checksum}' AND MESSAGE_ID = '{MessageId}'"
_firebird.ExecuteNonQueryWithConnection(oSQL, Transaction.Connection, Firebird.TransactionMode.ExternalTransaction, Transaction) _firebird.ExecuteNonQueryWithConnection(oSQL, oConnection, Firebird.TransactionMode.WithTransaction)
Return True Return True
Catch ex As Exception Catch ex As Exception

4
Modules.Jobs/My Project/AssemblyInfo.vb
View File

@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
<Assembly: AssemblyVersion("1.6.4.0")> <Assembly: AssemblyVersion("1.6.5.0")>
<Assembly: AssemblyFileVersion("1.6.4.0")> <Assembly: AssemblyFileVersion("1.6.5.0")>