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

Timas, MDM, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-05-04 15:16:25 +02:00
parent 1d4988346e
commit f266a01586
7 changed files with 137 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb
View File

@@ -2,22 +2,19 @@
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Public Class usrCntlATLAS_AnkunftsAnzeige Public Class usrCntlATLAS_AnkunftsAnzeige
Property ALLG As usrCntlATLAS_AnkunftsAnzeige Property ALLG As usrCntlATLAS_AnkunftsAnzeige
Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso
Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen
Dim sentToDakosy = False Dim sentToDakosy = False
Dim GesamtsicherheitREF As cAufschubKonten
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz
Dim Standort As String = "" Dim Standort As String = ""
Dim gsnr As Integer = -1 Dim gsnr As Integer = -1
Dim WarenwertEUR As Double = 0 Dim WarenwertEUR As Double = 0
Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, gsnr As Integer, WarenwertEUR As Double) Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cAufschubKonten, Standort As String, gsnr As Integer, WarenwertEUR As Double)
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()
@@ -254,7 +251,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
End Select End Select
Return "quickstop@verag.ag" Return "quickstop@verag.ag"
End Function End Function
Private Function createGesamtsicherheitDummy(GesSichRef As cGesamtsicherheitsReferenz, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double) Private Function createGesamtsicherheitDummy(GesSichRef As cAufschubKonten, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double)
Try Try
@@ -288,15 +285,15 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
.gs_posSubNr = Nothing .gs_posSubNr = Nothing
.gs_datum = Today() .gs_datum = Today()
.gs_warenwert = WarenwertEUR .gs_warenwert = WarenwertEUR
.gs_sicherheitsbetrag = Math.Round(WarenwertEUR * (GesSichRef.gsr_zollsatz / 100), 2) .gs_sicherheitsbetrag = Math.Round(WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100), 2)
.gs_standort = Me.Standort .gs_standort = Me.Standort
.gs_art = "OPEN" .gs_art = "OPEN"
.gs_datum = DateTime.Now .gs_datum = DateTime.Now
.gs_erstellungsdatum = DateTime.Now .gs_erstellungsdatum = DateTime.Now
.gs_freitext = "DAKOSY-DUMMY" .gs_freitext = "DAKOSY-DUMMY"
.gs_saldo = GesSichRef.gsr_Saldo .gs_saldo = GesSichRef.brgakto_gs_aktSaldo
.gs_atr = "0" .gs_atr = "0"
.gs_zollsatz = GesSichRef.gsr_zollsatz .gs_zollsatz = GesSichRef.brgakto_gs_zollsatz
.gs_avisoId = AVISO.AvisoID .gs_avisoId = AVISO.AvisoID
.gs_filialenNr = SENDUNG.FilialenNr .gs_filialenNr = SENDUNG.FilialenNr
.gs_abfertigungsnr = SENDUNG.AbfertigungsNr .gs_abfertigungsnr = SENDUNG.AbfertigungsNr

4
SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb
View File

@@ -20,7 +20,7 @@ Public Class frmZollanmeldung
Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing
Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz = Nothing Dim GesamtsicherheitREF As cAufschubKonten = Nothing
Dim Standort As String = "" Dim Standort As String = ""
Dim gsnr As Integer = -1 Dim gsnr As Integer = -1
Dim WarenwertEUR As Double = 0 Dim WarenwertEUR As Double = 0
@@ -79,7 +79,7 @@ Public Class frmZollanmeldung
End Sub End Sub
Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, JAHR As Integer, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, WarenwertEUR As Double, Optional gsnr As Integer = -1, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing) Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, JAHR As Integer, GesamtsicherheitREF As cAufschubKonten, Standort As String, WarenwertEUR As Double, Optional gsnr As Integer = -1, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing)
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()

16
SDL/cProgramFunctions.vb
View File

@@ -1,18 +1,12 @@
 Imports System.ComponentModel
Imports System.Drawing.Printing
Imports GrapeCity.ActiveReports
Imports System.Threading
Imports System.Reflection Imports System.Reflection
Imports System.ComponentModel
Imports ClosedXML.Excel
Imports System.Text.RegularExpressions Imports System.Text.RegularExpressions
Imports itextsharp.text.pdf Imports System.Threading
Imports SDL.eu.europa.ec Imports ClosedXML.Excel
Imports Microsoft.Office.Interop Imports GrapeCity.ActiveReports
Imports GrapeCity.DataVisualization.TypeScript Imports GrapeCity.DataVisualization.TypeScript
Imports SDL.eu.europa.ec
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Imports GrapeCity.ActiveReports.Printing
Public Class cBerechtignungenFunctions Public Class cBerechtignungenFunctions

180
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -2186,24 +2186,24 @@ Public Class frmMDMDatenverarbetiung
' End If ' End If
'End If 'End If
Dim connectionString = "" 'Dim connectionString = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
Else 'Else
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
End If 'End If
Dim con As New OleDbConnection(connectionString) 'Dim con As New OleDbConnection(connectionString)
Dim cmd As New OleDbCommand 'Dim cmd As New OleDbCommand
Dim var1 As String 'Dim var1 As String
Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
Dim reader As OleDbDataReader = Nothing 'Dim reader As OleDbDataReader = Nothing
If dt IsNot Nothing Then If dt IsNot Nothing Then
con.Open()
For Each r In dt.Rows For Each r In dt.Rows
Try Try
'Zeitstempel 'Zeitstempel
@@ -2212,35 +2212,35 @@ Public Class frmMDMDatenverarbetiung
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "'," & CDbl(r(7)).ToString.Replace(",", ".") & "," & CDbl(r(8)).ToString.Replace(",", ".") & "," & CDbl(r(9)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL") r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "'," & CDbl(r(7)).ToString.Replace(",", ".") & "," & CDbl(r(8)).ToString.Replace(",", ".") & "," & CDbl(r(9)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10) " 'Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10) "
' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";" '' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
Using Command As New OleDbCommand(SQLQuery, con) 'Using Command As New OleDbCommand(SQLQuery, con)
Command.Parameters.AddWithValue("@P1", r(0)) ' Command.Parameters.AddWithValue("@P1", r(0))
Command.Parameters.AddWithValue("@P2", r(1)) ' Command.Parameters.AddWithValue("@P2", r(1))
Command.Parameters.AddWithValue("@P3", r(2)) ' Command.Parameters.AddWithValue("@P3", r(2))
Command.Parameters.AddWithValue("@P4", r(3)) ' Command.Parameters.AddWithValue("@P4", r(3))
Command.Parameters.AddWithValue("@P5", r(4)) ' Command.Parameters.AddWithValue("@P5", r(4))
Command.Parameters.AddWithValue("@P6", r(5)) ' Command.Parameters.AddWithValue("@P6", r(5))
Command.Parameters.AddWithValue("@P7", r(6)) ' Command.Parameters.AddWithValue("@P7", r(6))
Command.Parameters.AddWithValue("@P8", CDbl(r(7))) ' Command.Parameters.AddWithValue("@P8", CDbl(r(7)))
Command.Parameters.AddWithValue("@P9", CDbl(r(8))) ' Command.Parameters.AddWithValue("@P9", CDbl(r(8)))
Command.Parameters.AddWithValue("@P10", CDbl(r(9))) ' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery() ' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
Command.Dispose() ' Command.Dispose()
End Using 'End Using
Catch ex2 As System.Exception Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace) ' MsgBox("err: " & ex2.Message & ex2.StackTrace)
Finally 'Finally
If reader IsNot Nothing Then reader.Close() ' If reader IsNot Nothing Then reader.Close()
End Try End Try
Next Next
con.Close()
End If End If
pic.Visible = True pic.Visible = True
Return True Return True
@@ -2292,24 +2292,24 @@ Public Class frmMDMDatenverarbetiung
Dim connectionString = "" 'Dim connectionString = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
Else 'Else
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
End If 'End If
Dim con As New OleDbConnection(connectionString) 'Dim con As New OleDbConnection(connectionString)
Dim cmd As New OleDbCommand 'Dim cmd As New OleDbCommand
Dim var1 As String 'Dim var1 As String
Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
Dim reader As OleDbDataReader = Nothing 'Dim reader As OleDbDataReader = Nothing
If dt IsNot Nothing Then If dt IsNot Nothing Then
con.Open() 'con.Open()
For Each r In dt.Rows For Each r In dt.Rows
Try Try
'Zeitstempel 'Zeitstempel
@@ -2318,38 +2318,38 @@ Public Class frmMDMDatenverarbetiung
r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "','" & r(7).ToString.Replace("'", " ") & "','" & r(8).ToString.Replace("'", " ") & "'," & CDbl(r(9)).ToString.Replace(",", ".") & "," & CDbl(r(10)).ToString.Replace(",", ".") & "," & CDbl(r(11)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL") r(0) & "'," & r(1) & ",'" & r(2) & "','" & r(3) & "','" & r(4) & "','" & r(5).ToString.Replace("'", " ") & "','" & r(6) & "','" & r(7).ToString.Replace("'", " ") & "','" & r(8).ToString.Replace("'", " ") & "'," & CDbl(r(9)).ToString.Replace(",", ".") & "," & CDbl(r(10)).ToString.Replace(",", ".") & "," & CDbl(r(11)).ToString.Replace(",", ".") & ",'" & datPloseAnhang.Text & "')", "FMZOLL")
Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) " 'Dim SQLQuery = "INSERT INTO tblMautbericht (Datenquelle,[Customer No],[Licence Plate Number],[Transaction Date],[Transaction Country],[Product description],[Card Number],[Entry Terminal],[Exit Terminal],[Nett Amount],[VAT Amount],[Total Amount]) VALUES (@P1,@P2,@P3,@P4,@P5,@P6,@P7,@P8,@P9,@P10,@P11,@P12) "
' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";" '' "SELECT * FROM DBParent WHERE P_ID = " & UniqeID & ";"
Using Command As New OleDbCommand(SQLQuery, con) 'Using Command As New OleDbCommand(SQLQuery, con)
Command.Parameters.AddWithValue("@P1", r(0)) ' Command.Parameters.AddWithValue("@P1", r(0))
Command.Parameters.AddWithValue("@P2", r(1)) ' Command.Parameters.AddWithValue("@P2", r(1))
Command.Parameters.AddWithValue("@P3", r(2)) ' Command.Parameters.AddWithValue("@P3", r(2))
Command.Parameters.AddWithValue("@P4", r(3)) ' Command.Parameters.AddWithValue("@P4", r(3))
Command.Parameters.AddWithValue("@P5", r(4)) ' Command.Parameters.AddWithValue("@P5", r(4))
Command.Parameters.AddWithValue("@P6", r(5)) ' Command.Parameters.AddWithValue("@P6", r(5))
Command.Parameters.AddWithValue("@P7", r(6)) ' Command.Parameters.AddWithValue("@P7", r(6))
Command.Parameters.AddWithValue("@P8", r(7)) ' Command.Parameters.AddWithValue("@P8", r(7))
Command.Parameters.AddWithValue("@P9", r(8)) ' Command.Parameters.AddWithValue("@P9", r(8))
Command.Parameters.AddWithValue("@P10", CDbl(r(9))) ' Command.Parameters.AddWithValue("@P10", CDbl(r(9)))
Command.Parameters.AddWithValue("@P11", CDbl(r(10))) ' Command.Parameters.AddWithValue("@P11", CDbl(r(10)))
Command.Parameters.AddWithValue("@P12", CDbl(r(11))) ' Command.Parameters.AddWithValue("@P12", CDbl(r(11)))
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery() ' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
Command.Dispose() ' Command.Dispose()
End Using 'End Using
Catch ex2 As System.Exception Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace) MsgBox("err: " & ex2.Message & ex2.StackTrace)
Finally 'Finally
If reader IsNot Nothing Then reader.Close() ' If reader IsNot Nothing Then reader.Close()
End Try End Try
Next Next
con.Close() 'con.Close()
End If End If
pic.Visible = True pic.Visible = True
Return True Return True
@@ -2465,42 +2465,42 @@ Public Class frmMDMDatenverarbetiung
Function deleteMautD(Datenquelle As String) As Boolean Function deleteMautD(Datenquelle As String) As Boolean
Try Try
Dim connectionString = "" 'Dim connectionString = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD_Test.accdb"
Else 'Else
connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb"
End If 'End If
Dim con As New OleDbConnection(connectionString) 'Dim con As New OleDbConnection(connectionString)
Dim cmd As New OleDbCommand 'Dim cmd As New OleDbCommand
Dim var1 As String 'Dim var1 As String
Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter()
Dim reader As OleDbDataReader = Nothing 'Dim reader As OleDbDataReader = Nothing
'FMZOLL-Tabelle 'FMZOLL-Tabelle
Try 'Try
con.Open() ' con.Open()
'Zeitstempel ' 'Zeitstempel
Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' " ' Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' "
Using Command As New OleDbCommand(SQLQuery, con) ' Using Command As New OleDbCommand(SQLQuery, con)
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery() ' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery()
Command.Dispose() ' Command.Dispose()
End Using ' End Using
Catch ex2 As System.Exception 'Catch ex2 As System.Exception
MsgBox("err: " & ex2.Message & ex2.StackTrace) ' MsgBox("err: " & ex2.Message & ex2.StackTrace)
Finally ' 'Finally
If reader IsNot Nothing Then reader.Close() ' ' If reader IsNot Nothing Then reader.Close()
End Try 'End Try
con.Close() 'con.Close()
Return SQL.doSQL("DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' AND cast(Billingdate as Date)= '" & datPloseAnhang.Text & "'", "FMZOLL") Return SQL.doSQL("DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' AND cast(Billingdate as Date)= '" & datPloseAnhang.Text & "'", "FMZOLL")

21
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -1065,7 +1065,7 @@ Public Class cTimasAPI
End Try End Try
End Function End Function
Public Sub getTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable, ByRef dt As DataTable) Public Sub getTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable, ByRef dt As DataTable, Optional ByRef employeedt As DataTable = Nothing)
Try Try
@@ -1084,8 +1084,21 @@ Public Class cTimasAPI
For Each row As DataRow In accountsdt.Rows For Each row As DataRow In accountsdt.Rows
id &= row("accountid") & "," id &= row("accountid") & ","
Next Next
rest.AddQueryParam("accounts", id) rest.AddQueryParam("accounts", id)
rest.AddQueryParam("employees", employeeNr)
Dim idEmployee As String = ""
If employeedt IsNot Nothing AndAlso employeedt.Rows.Count > 0 Then
For Each row As DataRow In employeedt.Rows
idEmployee &= row("employeeId") & ","
Next
Else
idEmployee = employeeNr
End If
rest.AddQueryParam("employees", idEmployee)
Dim sbResponseBody As String Dim sbResponseBody As String
@@ -1117,6 +1130,7 @@ Public Class cTimasAPI
If dt IsNot Nothing And Not dt.Columns.Contains("accountid") Then If dt IsNot Nothing And Not dt.Columns.Contains("accountid") Then
dt.Columns.Add("accountid", GetType(Integer)) dt.Columns.Add("accountid", GetType(Integer))
dt.Columns.Add("employeeid", GetType(Integer))
dt.Columns.Add("date", GetType(String)) dt.Columns.Add("date", GetType(String))
dt.Columns.Add("value", GetType(Double)) dt.Columns.Add("value", GetType(Double))
dt.Columns.Add("multiplier", GetType(String)) dt.Columns.Add("multiplier", GetType(String))
@@ -1133,6 +1147,7 @@ Public Class cTimasAPI
If accounts.StringOf("value") <> "" Then If accounts.StringOf("value") <> "" Then
Dim R As DataRow = dt.NewRow Dim R As DataRow = dt.NewRow
R("accountid") = accounts.IntOf("accountid") R("accountid") = accounts.IntOf("accountid")
R("employeeid") = accounts.IntOf("employeeid")
R("date") = accounts.StringOf("date") R("date") = accounts.StringOf("date")
Dim timeToDouble = accounts.StringOf("value").Replace("-", "") Dim timeToDouble = accounts.StringOf("value").Replace("-", "")
Dim ts As TimeSpan = New TimeSpan(Integer.Parse(timeToDouble.Split(":"c)(0)), Integer.Parse(timeToDouble.Split(":"c)(1)), 0) Dim ts As TimeSpan = New TimeSpan(Integer.Parse(timeToDouble.Split(":"c)(0)), Integer.Parse(timeToDouble.Split(":"c)(1)), 0)
@@ -1144,6 +1159,8 @@ Public Class cTimasAPI
End While End While
If dt.Rows.Count = 0 Then Exit Sub
dt.DefaultView.Sort = " accountid asc, date asc" dt.DefaultView.Sort = " accountid asc, date asc"
dt = dt.DefaultView.ToTable() dt = dt.DefaultView.ToTable()

2
VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb
View File

@@ -199,7 +199,7 @@ Public Class cGesamtsicherheitsReferenz
when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
when gsp_art = 'Close' then gsp_sicherheitsbetrag when gsp_art = 'Close' then gsp_sicherheitsbetrag
end) end)
as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & gsr_standort & "' ))" as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsnr IN (select gs_gsnr from [tblGesamtsicherheit] where gs_standort = '" & gsr_standort & "' ))"
Dim dt As New DataTable Dim dt As New DataTable
Dim mrn As Double = 0 Dim mrn As Double = 0

10
VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
View File

@@ -1,6 +1,16 @@
Imports System.Data.SqlClient Imports System.Data.SqlClient
Imports System.Reflection Imports System.Reflection
Public Class Sicherheiten_Standort
Public Const VERAG_AG As String = "VERAG AG"
Public Const VERAG_GMBH As String = "VERAG GmbH"
Public Const VERAG_CS As String = "VERAG CS"
Public Const IMEX As String = "IMEX"
Public Const UNISPED As String = "UNISPED GmbH"
Public Const AMBAR As String = "AMBAR GmbH"
Public Const ATILLA As String = "ATILLA GmbH"
End Class
Public Class cSicherheiten Public Class cSicherheiten
Property gs_gsId As Integer Property gs_gsId As Integer