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

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-01-17 15:57:17 +01:00
parent bcdfecfa90 d02b7f1dea
commit 948431d397
10 changed files with 596 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERAG_PROG_ALLGEMEIN/Classes/cAsfinagMaut.vb
View File

@@ -119,7 +119,7 @@ Public Class cAsfinagMaut
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='ASFINAG' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='ASFINAG' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
End Class

2
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -415,7 +415,7 @@ Public Class cIDS
Shared apiSettingsloaded As Boolean = False
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean

2
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -251,7 +251,7 @@ Public Class cRMC
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='RMC' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='RMC' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean

2
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -1407,7 +1407,7 @@ Public Class cUTA
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='UTA' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='UTA' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean

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

@@ -42,7 +42,7 @@ Public Class cMSEAPI
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='MSE' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='MSE' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
@@ -92,7 +92,7 @@ Public Class cMSEAPI
Dim bAutoReconnect As Boolean = True
success = rest.Connect(API_STRING, port, bTls, bAutoReconnect)
If (success <> True) Then
Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason)
Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason)
Debug.WriteLine(rest.LastErrorText)
failureText = rest.LastErrorText
Return False
@@ -953,6 +953,8 @@ Public Class cMSEAPI
Dim j As Integer = 0
'dt.Columns.Clear()
If dt IsNot Nothing And Not dt.Columns.Contains("name") Then
dt.Columns.Add("name", GetType(String))
@@ -962,7 +964,7 @@ Public Class cMSEAPI
dt.Columns.Add("msts_vat_number", GetType(String))
dt.Columns.Add("invoice_id", GetType(String))
dt.Columns.Add("invoice_date", GetType(String))
'dt.Columns.Add("invoice_nr", GetType(String))
dt.Columns.Add("invoice_nr", GetType(String))
While j < num
@@ -976,7 +978,7 @@ Public Class cMSEAPI
R("msts_vat_number") = checkNullStr(invoice.StringOf("msts_vat_number"))
R("invoice_id") = checkNullInteger(invoice.StringOf("invoice_id"))
R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date"))
'R("invoice_nr") = checkNullStr(invoice.StringOf("invoice_nr"))
R("invoice_nr") = checkNullStr(invoice.StringOf("invoice_nr"))
Dim invoice_date_string As String = invoice.StringOf("invoice_date")
@@ -997,7 +999,7 @@ Public Class cMSEAPI
inv.msts_vat_number = checkNullStr(R("msts_vat_number"))
inv.invoice_id = checkNullInteger(R("invoice_id"))
inv.invoice_date = checkNullDateNothing(R("invoice_date"))
'inv.invoice_nr = checkNullStr(R("invoice_nr"))
inv.invoice_nr = checkNullStr(R("invoice_nr"))
If nameString.Length > 13 AndAlso nameString.Contains("_") Then
inv.customer_number = nameString.Substring(nameString.IndexOf("_") + 1, 5)
@@ -1021,9 +1023,6 @@ Public Class cMSEAPI
For Each r As DataRow In dt.Rows
'\\fmzoll\f\FMZoll\MSE\TESTRECHNUNGEN
'\\datenarchiv\Datenarchiv\MDM_SCHNITTSTELLEN\ECHTSYSTEM\Nachrichtendaten_ZIEL\MSE
If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices
Dim inv As New cMSEInvoices(r("name"), r("invoice_id"))
If inv.daId Is Nothing Then 'verhindert unnötige Downloads