edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USTVA; MDM-Einarbeitung

Browse Source
This commit is contained in:
d.breimaier
2025-10-03 09:12:44 +02:00
parent 44d3949da5
commit 584c88c68e
6 changed files with 131 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
View File

@@ -78,7 +78,7 @@ Public Class cMSEAPI
End Function
Public Function getNewestTransactions(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer, onlyBilledTransactions As Boolean) As String
Public Function getNewestTransactions(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer, onlyBilledTransactions As Boolean, ByRef savedTrans As Integer) As String
Try
Dim returnText As String = ""
Dim failureText As String = ""
@@ -155,7 +155,7 @@ Public Class cMSEAPI
Return "FEHLER im TransaktionArray"
End If
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), onlyBilledTransactions)
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), onlyBilledTransactions, savedTrans)
Catch ex As WebException
@@ -413,7 +413,7 @@ Public Class cMSEAPI
End If
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), 0)
Catch ex As WebException
@@ -526,7 +526,7 @@ Public Class cMSEAPI
End If
'If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
saveTransactions(num, dt, transactions, json.StringOf("receiver"), True,) ' wenn ID explizit aufgerufen keine Prüfung auf receivcer und purchaseDate
saveTransactions(num, dt, transactions, json.StringOf("receiver"), 0, True,) ' wenn ID explizit aufgerufen keine Prüfung auf receivcer und purchaseDate
End If
Next row
@@ -545,7 +545,7 @@ Public Class cMSEAPI
End Function
Public Function getTransactionsFromBatchNrAndPage(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer) As String
Public Function getTransactionsFromBatchNrAndPage(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer, ByRef savedTrans As Integer) As String
Try
Dim returnText As String = ""
Dim failureText As String = ""
@@ -625,7 +625,7 @@ Public Class cMSEAPI
Return "FEHLER Array Transaktions ist leer"
End If
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), savedTrans)
Catch ex As WebException
@@ -1048,7 +1048,7 @@ Public Class cMSEAPI
End Function
Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, ByRef savedTrans As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
Dim j As Integer = 0
@@ -1215,9 +1215,11 @@ Public Class cMSEAPI
'trans.distance_km = CDbl(R("distance_km"))
If onlyBilledTransactions Then
If trans.transaction_status = "Billed" Then trans.SAVE()
If trans.transaction_status = "Billed" Then
If trans.SAVE() Then savedTrans += 1
End If
Else
trans.SAVE()
If trans.SAVE() Then savedTrans += 1
End If