diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index fbc6c010..845fd667 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -2,22 +2,19 @@ Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlATLAS_AnkunftsAnzeige - Property ALLG As usrCntlATLAS_AnkunftsAnzeige Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen Dim sentToDakosy = False - - Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz + Dim GesamtsicherheitREF As cAufschubKonten Dim Standort As String = "" Dim gsnr As Integer = -1 Dim WarenwertEUR As Double = 0 - 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. InitializeComponent() @@ -144,12 +141,12 @@ Public Class usrCntlATLAS_AnkunftsAnzeige End If End If - ' DY_ANM.UPDATE_DATA() + ' DY_ANM.UPDATE_DATA() - 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. - ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) - Me.FindForm.Close() + Me.FindForm.Close() End If Me.Cursor = Cursors.Default End Sub @@ -254,7 +251,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige End Select Return "quickstop@verag.ag" 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 @@ -288,15 +285,15 @@ Public Class usrCntlATLAS_AnkunftsAnzeige .gs_posSubNr = Nothing .gs_datum = Today() .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_art = "OPEN" .gs_datum = DateTime.Now .gs_erstellungsdatum = DateTime.Now .gs_freitext = "DAKOSY-DUMMY" - .gs_saldo = GesSichRef.gsr_Saldo + .gs_saldo = GesSichRef.brgakto_gs_aktSaldo .gs_atr = "0" - .gs_zollsatz = GesSichRef.gsr_zollsatz + .gs_zollsatz = GesSichRef.brgakto_gs_zollsatz .gs_avisoId = AVISO.AvisoID .gs_filialenNr = SENDUNG.FilialenNr .gs_abfertigungsnr = SENDUNG.AbfertigungsNr diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index 4b482c1f..1b4260e8 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -20,7 +20,7 @@ Public Class frmZollanmeldung Dim DY As DAKOSY_Worker.cDakosy_Zollanmeldungen = Nothing - Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz = Nothing + Dim GesamtsicherheitREF As cAufschubKonten = Nothing Dim Standort As String = "" Dim gsnr As Integer = -1 Dim WarenwertEUR As Double = 0 @@ -79,7 +79,7 @@ Public Class frmZollanmeldung 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. InitializeComponent() diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 01dee42b..aaae9947 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -1,18 +1,12 @@ - -Imports System.Drawing.Printing -Imports GrapeCity.ActiveReports - -Imports System.Threading +Imports System.ComponentModel Imports System.Reflection -Imports System.ComponentModel -Imports ClosedXML.Excel Imports System.Text.RegularExpressions -Imports itextsharp.text.pdf -Imports SDL.eu.europa.ec -Imports Microsoft.Office.Interop +Imports System.Threading +Imports ClosedXML.Excel +Imports GrapeCity.ActiveReports Imports GrapeCity.DataVisualization.TypeScript +Imports SDL.eu.europa.ec Imports VERAG_PROG_ALLGEMEIN -Imports GrapeCity.ActiveReports.Printing Public Class cBerechtignungenFunctions diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 4171a470..283e22ac 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2186,24 +2186,24 @@ Public Class frmMDMDatenverarbetiung ' End If 'End If - Dim connectionString = "" - 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" - Else - connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" - End If + 'Dim connectionString = "" + '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" + 'Else + ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" + 'End If - Dim con As New OleDbConnection(connectionString) - Dim cmd As New OleDbCommand - Dim var1 As String + 'Dim con As New OleDbConnection(connectionString) + 'Dim cmd As New OleDbCommand + 'Dim var1 As String - Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() - Dim reader As OleDbDataReader = Nothing + 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() + 'Dim reader As OleDbDataReader = Nothing If dt IsNot Nothing Then - con.Open() + For Each r In dt.Rows Try '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") - 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 & ";" - Using Command As New OleDbCommand(SQLQuery, con) + '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 & ";" + 'Using Command As New OleDbCommand(SQLQuery, con) - Command.Parameters.AddWithValue("@P1", r(0)) - Command.Parameters.AddWithValue("@P2", r(1)) - Command.Parameters.AddWithValue("@P3", r(2)) - Command.Parameters.AddWithValue("@P4", r(3)) - Command.Parameters.AddWithValue("@P5", r(4)) - Command.Parameters.AddWithValue("@P6", r(5)) - Command.Parameters.AddWithValue("@P7", r(6)) - Command.Parameters.AddWithValue("@P8", CDbl(r(7))) - Command.Parameters.AddWithValue("@P9", CDbl(r(8))) - Command.Parameters.AddWithValue("@P10", CDbl(r(9))) + ' Command.Parameters.AddWithValue("@P1", r(0)) + ' Command.Parameters.AddWithValue("@P2", r(1)) + ' Command.Parameters.AddWithValue("@P3", r(2)) + ' Command.Parameters.AddWithValue("@P4", r(3)) + ' Command.Parameters.AddWithValue("@P5", r(4)) + ' Command.Parameters.AddWithValue("@P6", r(5)) + ' Command.Parameters.AddWithValue("@P7", r(6)) + ' Command.Parameters.AddWithValue("@P8", CDbl(r(7))) + ' Command.Parameters.AddWithValue("@P9", CDbl(r(8))) + ' Command.Parameters.AddWithValue("@P10", CDbl(r(9))) - If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery() - Command.Dispose() - End Using + ' If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Command.ExecuteNonQuery() + ' Command.Dispose() + 'End Using Catch ex2 As System.Exception - MsgBox("err: " & ex2.Message & ex2.StackTrace) + ' MsgBox("err: " & ex2.Message & ex2.StackTrace) - Finally - If reader IsNot Nothing Then reader.Close() + 'Finally + ' If reader IsNot Nothing Then reader.Close() End Try Next - con.Close() + End If pic.Visible = True Return True @@ -2292,24 +2292,24 @@ Public Class frmMDMDatenverarbetiung - Dim connectionString = "" - 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" - Else - connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" - End If + 'Dim connectionString = "" + '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" + 'Else + ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" + 'End If - Dim con As New OleDbConnection(connectionString) - Dim cmd As New OleDbCommand - Dim var1 As String + 'Dim con As New OleDbConnection(connectionString) + 'Dim cmd As New OleDbCommand + 'Dim var1 As String - Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() - Dim reader As OleDbDataReader = Nothing + 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() + 'Dim reader As OleDbDataReader = Nothing If dt IsNot Nothing Then - con.Open() + 'con.Open() For Each r In dt.Rows Try '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") - 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 & ";" - Using Command As New OleDbCommand(SQLQuery, con) + '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 & ";" + 'Using Command As New OleDbCommand(SQLQuery, con) - Command.Parameters.AddWithValue("@P1", r(0)) - Command.Parameters.AddWithValue("@P2", r(1)) - Command.Parameters.AddWithValue("@P3", r(2)) - Command.Parameters.AddWithValue("@P4", r(3)) - Command.Parameters.AddWithValue("@P5", r(4)) - Command.Parameters.AddWithValue("@P6", r(5)) - Command.Parameters.AddWithValue("@P7", r(6)) - Command.Parameters.AddWithValue("@P8", r(7)) - Command.Parameters.AddWithValue("@P9", r(8)) - Command.Parameters.AddWithValue("@P10", CDbl(r(9))) - Command.Parameters.AddWithValue("@P11", CDbl(r(10))) - Command.Parameters.AddWithValue("@P12", CDbl(r(11))) + ' Command.Parameters.AddWithValue("@P1", r(0)) + ' Command.Parameters.AddWithValue("@P2", r(1)) + ' Command.Parameters.AddWithValue("@P3", r(2)) + ' Command.Parameters.AddWithValue("@P4", r(3)) + ' Command.Parameters.AddWithValue("@P5", r(4)) + ' Command.Parameters.AddWithValue("@P6", r(5)) + ' Command.Parameters.AddWithValue("@P7", r(6)) + ' Command.Parameters.AddWithValue("@P8", r(7)) + ' Command.Parameters.AddWithValue("@P9", r(8)) + ' Command.Parameters.AddWithValue("@P10", CDbl(r(9))) + ' Command.Parameters.AddWithValue("@P11", CDbl(r(10))) + ' 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() - End Using + ' Command.Dispose() + 'End Using Catch ex2 As System.Exception MsgBox("err: " & ex2.Message & ex2.StackTrace) - Finally - If reader IsNot Nothing Then reader.Close() + 'Finally + ' If reader IsNot Nothing Then reader.Close() End Try Next - con.Close() + 'con.Close() End If pic.Visible = True Return True @@ -2465,42 +2465,42 @@ Public Class frmMDMDatenverarbetiung Function deleteMautD(Datenquelle As String) As Boolean Try - Dim connectionString = "" - 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" - Else - connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" - End If + 'Dim connectionString = "" + '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" + 'Else + ' connectionString = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=\\FMZOLL.verag.ost.dmn\f\FMZoll\MautD.accdb" + 'End If - Dim con As New OleDbConnection(connectionString) - Dim cmd As New OleDbCommand - Dim var1 As String + 'Dim con As New OleDbConnection(connectionString) + 'Dim cmd As New OleDbCommand + 'Dim var1 As String - Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() - Dim reader As OleDbDataReader = Nothing + 'Dim adapter As OleDbDataAdapter = New OleDbDataAdapter() + 'Dim reader As OleDbDataReader = Nothing 'FMZOLL-Tabelle - Try - con.Open() + 'Try + ' con.Open() - 'Zeitstempel - Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' " - Using Command As New OleDbCommand(SQLQuery, con) + ' 'Zeitstempel + ' Dim SQLQuery = "DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' " + ' 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() - End Using + ' Command.Dispose() + ' End Using - Catch ex2 As System.Exception - MsgBox("err: " & ex2.Message & ex2.StackTrace) + 'Catch ex2 As System.Exception + ' MsgBox("err: " & ex2.Message & ex2.StackTrace) - Finally - If reader IsNot Nothing Then reader.Close() - End Try + ' 'Finally + ' ' If reader IsNot Nothing Then reader.Close() + 'End Try - con.Close() + 'con.Close() Return SQL.doSQL("DELETE FROM tblMautbericht WHERE Datenquelle='" & Datenquelle & "' AND cast(Billingdate as Date)= '" & datPloseAnhang.Text & "'", "FMZOLL") diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index ac188e62..dbc44b3c 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -1065,7 +1065,7 @@ Public Class cTimasAPI End Try 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 @@ -1084,8 +1084,21 @@ Public Class cTimasAPI For Each row As DataRow In accountsdt.Rows id &= row("accountid") & "," Next + 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 @@ -1117,6 +1130,7 @@ Public Class cTimasAPI If dt IsNot Nothing And Not dt.Columns.Contains("accountid") Then dt.Columns.Add("accountid", GetType(Integer)) + dt.Columns.Add("employeeid", GetType(Integer)) dt.Columns.Add("date", GetType(String)) dt.Columns.Add("value", GetType(Double)) dt.Columns.Add("multiplier", GetType(String)) @@ -1133,6 +1147,7 @@ Public Class cTimasAPI If accounts.StringOf("value") <> "" Then Dim R As DataRow = dt.NewRow R("accountid") = accounts.IntOf("accountid") + R("employeeid") = accounts.IntOf("employeeid") R("date") = accounts.StringOf("date") 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) @@ -1144,6 +1159,8 @@ Public Class cTimasAPI End While + If dt.Rows.Count = 0 Then Exit Sub + dt.DefaultView.Sort = " accountid asc, date asc" dt = dt.DefaultView.ToTable() diff --git a/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb b/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb index 512208f9..43291ed8 100644 --- a/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb +++ b/VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb @@ -199,7 +199,7 @@ Public Class cGesamtsicherheitsReferenz when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) when gsp_art = 'Close' then gsp_sicherheitsbetrag 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 mrn As Double = 0 diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 15634b24..6a16fd3f 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -1,6 +1,16 @@ Imports System.Data.SqlClient 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 Property gs_gsId As Integer