Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2026-10-14 16:56:16 +02:00
29 changed files with 1641 additions and 137 deletions

View File

@@ -0,0 +1,214 @@

Imports System.Data.SqlClient
Imports System.Reflection
Public Class cMDM_Bankspesen
Property id As Integer
Property kundenNr As Object = Nothing
Property umsatzID As Object = Nothing
Property buchungstext As Object = Nothing
Property datum As Object = Nothing
Property IBAN As Object = Nothing
Property BIC As Object = Nothing
Property waehrung As Object = Nothing
Property betrag As Object = Nothing
Property gebuehr As Object = Nothing
Property timestamp As Object = Nothing
Property kontoauszug As Object = Nothing
Property typ As Object = Nothing
Property verrechnet As Object = Nothing
Property RK_ID As Object = Nothing
Property SR_datum As Object = Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New(id)
Me.id = id
LOAD()
End Sub
Sub New(kundennr, datum, typ)
Me.kundenNr = kundennr
Me.datum = datum
Me.typ = typ
LOAD(kundennr, datum, typ)
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("id", id,, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundenNr", kundenNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("umsatzID", umsatzID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("buchungstext", buchungstext))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("datum", datum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("IBAN", IBAN))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BIC", BIC))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("waehrung", waehrung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("betrag", betrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("timestamp", timestamp))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gebuehr", gebuehr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kontoauszug", kontoauszug))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("typ", typ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("verrechnet", verrechnet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RK_ID", RK_ID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SR_datum", SR_datum))
Return list
End Function
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMDM_Bankspesen WHERE id=@id) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
Public Sub LOAD()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblMDM_Bankspesen WHERE id=@id ", conn)
cmd.Parameters.AddWithValue("@id", id)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Public Sub LOAD(kundennr, BelegNr, typ)
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblMDM_Bankspesen WHERE kundennr=@kundennr and datum=@datum and typ=@typ ", conn)
cmd.Parameters.AddWithValue("@kundennr", kundennr)
cmd.Parameters.AddWithValue("@datum", datum)
cmd.Parameters.AddWithValue("@typ", typ)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblMDM_Bankspesen] SET " & str & " WHERE id=@id ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public Function getInsertCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim str As String = ""
Dim values As String = ""
For Each i In list
If Not i.isPrimaryParam Then
str &= "[" & i.Text & "],"
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
values = values.Substring(0, values.Length - 1) 'wg. ','
Return (" INSERT INTO tblMDM_Bankspesen (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
'Public Shared Function GET_NICHTABGERECHNETE_ZB(ByRef dt As DataTable, KundenNr As Integer) As Boolean
' Try
' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
' Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
' Using cmd As New SqlCommand("SELECT id,belegNr,belegDatum,buchungstext,zahlungsBetrag,zahlungDatum, ueberschreitungInTagen, zinssatz,zinsbetrag, zahlungsperiode_start,zahlungsperiode_ende, faelligkeitsDatum
' FROM
' tblMDM_Zinsberechnung
' WHERE
' kundenNr = @KundenNr
' AND zinsbetrag <> 0
' AND verrechnet is null
' AND left(buchungstext,6) <> 'Zinsen'
' ORDER BY
' belegDatum", conn)
' cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
' Dim dr = cmd.ExecuteReader()
' dt.Load(dr)
' 'While dr.Read
' ' dt.Load(dr)
' 'End While
' dr.Close()
' End Using
' End Using
' Return True
' Catch ex As Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
' End Try
' Return False
'End Function
End Class

View File

@@ -424,14 +424,14 @@ Public Class cRMC
End If
If dt IsNot Nothing Then
Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt"
Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST, rmc_pdfFileName as Dateiname from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr & " group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum, kde_keineMWSt, rmc_pdfFileName"
dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
dt_missingInvoices = dt
Return dt.Rows.Count
Else
If getDetailsInDatatable Then
Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr
Dim SQLstr = "Select rmc_reNr As RechnungsNr,rmc_reDatum As Rechnungsdatum, Adressen.AdressenNr As KundenNr,Adressen.[Name 1] As Kunde, kde_keineMWSt As keineMWST, rmc_pdfFileName as Dateiname from [tblRMCImport] INNER JOIN Adressen On WölflKundenNr=[rmc_kdNr] Or weitereWölflKundenNr=[rmc_kdNr] INNER JOIN tblKundenErweitert On AdressenNr = kde_KundenNr where rmc_daId Is null " & sqlTime & sqlAdressenNr
dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt_missingInvoices.Rows.Count
Else

View File

@@ -65,18 +65,18 @@ Public Class cUTA
End If
If dt IsNot Nothing Then
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST,'AP' + cast(A.UTAKundenNr as varchar) + '_' + + FORMAT( U.Abrechnungsnummer,'0') + '_' + FORMAT(U.Rechnungsnummer_pro_Lieferland,'0') + '_'+ cast(cast(U.Rechnungsdatum as date) as varchar) + '_'+ cast(U.Lieferland as varchar) +'*' as Suchbegriff FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
dt_missingInvoices = dt
Return dt.Rows.Count
Else
If getDetailsInDatatable Then
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST,'AP' + cast(A.UTAKundenNr as varchar) + '_' + FORMAT( U.Abrechnungsnummer,'0') + '_' + FORMAT(U.Rechnungsnummer_pro_Lieferland,'0') + '_'+ cast(cast(U.Rechnungsdatum as date) as varchar) + '_'+ cast(U.Lieferland as varchar) +'*' as Suchbegriff FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt_missingInvoices.Rows.Count
Else
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr As UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
Dim SQLstr = "Select U.Abrechnungsnummer As Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,CAST(U.Rechnungsdatum As Date) As Rechnungsdatum,A.AdressenNr As KundenNr,A.UTAKundenNr as UTAKundenNr,A.[Name 1] As Kunde,A.LandKz, kde_keineMWSt As keineMWST,'AP' + cast(A.UTAKundenNr as varchar) + '_' + FORMAT( U.Abrechnungsnummer,'0') + '_' + FORMAT(U.Rechnungsnummer_pro_Lieferland,'0') + '_'+ cast(cast(U.Rechnungsdatum as date) as varchar) + '_'+ cast(U.Lieferland as varchar) +'*' as Suchbegriff FROM tblUTAImportNew U INNER JOIN Adressen A On A.UTAKundenNr = U.Kundennummer INNER JOIN tblKundenErweitert On A.AdressenNr = kde_KundenNr WHERE U.daId Is NULL " & sqlTime & sqlAdressenNr & " AND NOT (A.LandKz = 'RO' AND U.Lieferland = 'ROM') GROUP BY U.Abrechnungsnummer,U.Rechnungsnummer_pro_Lieferland,U.Lieferland,U.Rechnungsdatum,A.AdressenNr,A.UTAKundenNr ,A.[Name 1],A.LandKz, kde_keineMWSt ORDER BY U.Rechnungsdatum"
dt_missingInvoices = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
Return dt_missingInvoices.Rows.Count

View File

@@ -94,7 +94,7 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.WebServiceUrl), _
Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/")> _
Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at:443/fonuid/ws/uidAbfrage/")> _
Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService() As String
Get
Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"),String)
@@ -104,7 +104,7 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.WebServiceUrl), _
Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at:443/fonws/ws/session")> _
Global.System.Configuration.DefaultSettingValueAttribute("https://finanzonline.bmf.gv.at:443/fonws/ws/session/")> _
Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService() As String
Get
Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"),String)

View File

@@ -12,10 +12,10 @@
<Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;TransparentNetworkIPResolution=False;Pooling=true;Min Pool Size=20;Max Pool Size=250</Value>
</Setting>
<Setting Name="VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService" Type="(Web Service URL)" Scope="Application">
<Value Profile="(Default)">https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/</Value>
<Value Profile="(Default)">https://finanzonline.bmf.gv.at:443/fonuid/ws/uidAbfrage/</Value>
</Setting>
<Setting Name="VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService" Type="(Web Service URL)" Scope="Application">
<Value Profile="(Default)">https://finanzonline.bmf.gv.at:443/fonws/ws/session</Value>
<Value Profile="(Default)">https://finanzonline.bmf.gv.at:443/fonws/ws/session/</Value>
</Setting>
<Setting Name="asdadasdasdasdasdasd" Type="System.String" Scope="User">
<Value Profile="(Default)" />

View File

@@ -1103,7 +1103,7 @@ Public Class cMSEAPI
End If
If Not inv.archiv Then inv.SAVE() 'bereits archiverte REchnungen nicht überschreiben!!!!
If Not inv.archiv AndAlso inv.name = "20260815_18273_FR_VAT.pdf" Then inv.SAVE() 'bereits archiverte REchnungen nicht überschreiben!!!!
End If
j = j + 1

View File

@@ -100,7 +100,7 @@ Public Class cTimasAPI
End Function
Public Function getTimeSaldo(maid As Integer, ByRef info As String, kindofbalance As String, ByRef Optional isEndpointRunning As Boolean = True, Optional datetimeformat As String = "seconds") As String
Public Function getTimeSaldo(maid As Integer, ByRef info As String, kindofbalance As String, ByRef Optional isEndpointRunning As Boolean = True, Optional datetimeformat As String = "seconds", Optional getRawData As Boolean = False, Optional timeStamp_deadline As String = "") As String
Try
Dim returnText As String = ""
Dim failureText As String = ""
@@ -118,14 +118,21 @@ Public Class cTimasAPI
Dim success As Boolean
rest.ClearAllQueryParams()
rest.IdleTimeoutMs = 5000
rest.AddQueryParam("format", datetimeformat)
If timeStamp_deadline <> "" AndAlso IsDate(timeStamp_deadline) Then
rest.AddQueryParam("stamp", CDate(timeStamp_deadline).ToString("yyyy-MM-dd"))
rest.IdleTimeoutMs = 300000
Else
rest.IdleTimeoutMs = 30000 'defualt
End If
Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance")
If (rest.LastMethodSuccess <> True) Then
Debug.WriteLine(rest.LastErrorText)
isEndpointRunning = rest.LastMethodSuccess
rest.IdleTimeoutMs = 30000 'defualt
Return timesaldo
End If
@@ -157,6 +164,9 @@ Public Class cTimasAPI
Case "seconds"
saldoAsDouble = CDbl(saldo)
saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2)
If getRawData Then Return saldoAsDouble.ToString
infoBuilder.Append(saldoAsDouble)
infoBuilder.Append(" h")
info = infoBuilder.ToString()
@@ -164,12 +174,18 @@ Public Class cTimasAPI
Case "minutes"
saldoAsDouble = CDbl(saldo)
saldoAsDouble = Math.Round(saldoAsDouble / 60, 2)
If getRawData Then Return saldoAsDouble.ToString
infoBuilder.Append(saldoAsDouble)
infoBuilder.Append(" min")
info = infoBuilder.ToString()
timesaldo = saldoAsDouble.ToString
Case "time"
If getRawData Then Return saldo.ToString
infoBuilder.Append(saldo)
infoBuilder.Append(" h")
info = infoBuilder.ToString()
@@ -312,7 +328,7 @@ Public Class cTimasAPI
success = json.UpdateString("lastname", mitarbeiter.mit_nname)
success = json.UpdateString("gender", IIf(mitarbeiter.mit_geschlecht = "m", "male", "female"))
success = json.UpdateInt("card", mitarbeiter.mit_terminalTimasId)
success = json.UpdateString("info", mitarbeiter.mit_firma & " - " & mitarbeiter.mit_abteilung)
success = json.UpdateString("info", ClientNr & " - " & mitarbeiter.mit_abteilung)
If mitarbeiter.mit_gebdat <> "" And IsDate(mitarbeiter.mit_gebdat) Then
success = json.UpdateString("birthday", CDate(mitarbeiter.mit_gebdat).ToString("yyyy-MM-dd"))
End If
@@ -992,7 +1008,7 @@ Public Class cTimasAPI
End Function
Public Function getEmployeeList(ByRef dt As DataTable) As String
Public Function getEmployeeList(ByRef dt As DataTable, TimasMandant As String) As String
Dim failureText As String = ""
@@ -1003,6 +1019,10 @@ Public Class cTimasAPI
End If
If TimasMandant <> "" Then
rest.AddQueryParam("employeemandants", TimasMandant)
End If
Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/")
If (rest.LastMethodSuccess <> True) Then
Debug.WriteLine(rest.LastErrorText)
@@ -1039,7 +1059,7 @@ Public Class cTimasAPI
dt.Columns.Add("Geschlecht", GetType(String))
dt.Columns.Add("Ausweis-Nr", GetType(Integer))
dt.Columns.Add("Info", GetType(String))
'dt.Columns.Add("AVISO-ID", GetType(Integer))
dt.Columns.Add("Mandant", GetType(String))
End If
dt.Clear()

View File

@@ -41,7 +41,7 @@ Public Class cSyska_Interface
Left Join tblKundenErweitert ON KundenNr=kde_KundenNr
Left Join [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz
Left Join Währungstabelle ON St.LandNr = Währungstabelle.Währungsschlüssel
WHERE FiBuSchnittstelle = 0 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' Order by [Konto-Nr]"
WHERE FiBuSchnittstelle = 1 And Auswahl ='A' AND FiBuSchnittstelleNr='" & FiBuSchnittstelleNr & "' Order by [Konto-Nr]"
Return SQL.loadDgvBySql(SQLString, "FMZOLL")
End Function

View File

@@ -419,6 +419,7 @@
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
<Compile Include="Classes\cKundenveranlagungUID.vb" />
<Compile Include="Classes\cMDMEInarbeitung.vb" />
<Compile Include="Classes\cMDM_Bankspesen.vb" />
<Compile Include="Classes\cMDMZinsberechnung.vb" />
<Compile Include="Classes\cKundenportal.vb" />
<Compile Include="Classes\cKundenSicherheiten.vb" />