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

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-05-05 11:28:17 +02:00
parent 925baf2818 f189ac7e24
commit 73df7bcea6
15 changed files with 293 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Fakturierung/cAutomailversand.vb
View File

@@ -29,7 +29,7 @@ Public Class cAutomailversand
LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr
INNER JOIN Währungstabelle on LandKz = Rechnungsausgang.RechnungsLandKz INNER JOIN Währungstabelle on LandKz = Rechnungsausgang.RechnungsLandKz
WHERE Rechnungsausgang.Status IN (2) and Rechnungsausgang.Automailversand_sent is null And Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & _Rechnungsdatum.ToShortDateString & "' WHERE Rechnungsausgang.Status IN (2) and Rechnungsausgang.Automailversand_sent is null And Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & _Rechnungsdatum.ToShortDateString & "'
and isnull(Rechnungsausgang.Automailversand,0) = 1 and Rechnungsausgang.Automailversand_sent = NULL and RechnungsNr > 0 " & IIf(KundenNr > 0, " AND RechnungsKundenNr = " & KundenNr, "") & " and isnull(Rechnungsausgang.Automailversand,0) = 1 and RechnungsNr > 0 " & IIf(KundenNr > 0, " AND RechnungsKundenNr = " & KundenNr, "") & "
GROUP BY RechnungsNr, RechnungsKundenNr,isnull(tblKundenErweitert.kde_keineMWSt,0),RechnungsLandKz, MitgliedslandEU GROUP BY RechnungsNr, RechnungsKundenNr,isnull(tblKundenErweitert.kde_keineMWSt,0),RechnungsLandKz, MitgliedslandEU
ORDER BY RechnungsLandKz, RechnungsKundenNr" ORDER BY RechnungsLandKz, RechnungsKundenNr"
@@ -39,7 +39,7 @@ Public Class cAutomailversand
LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr
INNER JOIN Währungstabelle on LandKz = Rechnungsausgang.RechnungsLandKz INNER JOIN Währungstabelle on LandKz = Rechnungsausgang.RechnungsLandKz
WHERE Rechnungsausgang.Status IN (2) and Rechnungsausgang.Automailversand_sent is null And Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & _Rechnungsdatum.ToShortDateString & "' WHERE Rechnungsausgang.Status IN (2) and Rechnungsausgang.Automailversand_sent is null And Rechnungsausgang.Firma_ID = '" & FirmaID & "' And Rechnungsausgang.Sammelrechnung = '" & SammelrechungArt & "' And CONVERT(DATE,Rechnungsausgang.Rechnungsdatum,104) = '" & _Rechnungsdatum.ToShortDateString & "'
and isnull(Rechnungsausgang.Automailversand,0) = 1 and Rechnungsausgang.Automailversand_sent = NULL and RechnungsNr > 0 and FakturierungsGruppe = '" & faktGruppe & "'" & IIf(KundenNr > 0, " AND RechnungsKundenNr = " & KundenNr, "") & " and isnull(Rechnungsausgang.Automailversand,0) = 1 and RechnungsNr > 0 and FakturierungsGruppe = '" & faktGruppe & "'" & IIf(KundenNr > 0, " AND RechnungsKundenNr = " & KundenNr, "") & "
GROUP BY RechnungsNr, RechnungsKundenNr,tblKundenErweitert.kde_SR_IM_EX GROUP BY RechnungsNr, RechnungsKundenNr,tblKundenErweitert.kde_SR_IM_EX
ORDER BY RechnungsLandKz, RechnungsKundenNr" ORDER BY RechnungsLandKz, RechnungsKundenNr"

33
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -1,5 +1,6 @@
Imports System.IO Imports System.IO
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Public Class frmAbrechnungsMaske Public Class frmAbrechnungsMaske
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -53,7 +54,7 @@ Public Class frmAbrechnungsMaske
FirmaTmp = "VERAGIMEX" FirmaTmp = "VERAGIMEX"
End If End If
FirmaTmp = "AMBAR" 'FirmaTmp = "AMBAR"
cboSachbearbeiter.Items.Clear() cboSachbearbeiter.Items.Clear()
@@ -246,22 +247,22 @@ Public Class frmAbrechnungsMaske
End If End If
.Columns("UnterNr").Width = 35 .Columns("UnterNr").Width = 35
.Columns("Art").Width = 30 .Columns("Art").Width = 30
.Columns("Betrag").Width = 100 .Columns("Betrag").Width = 100
.Columns("Rechnungsempfänger").MinimumWidth = 150 .Columns("Rechnungsempfänger").MinimumWidth = 150
.Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
If Not cbxGutschriftenAnVerag.Checked Then If Not cbxGutschriftenAnVerag.Checked Then
.Columns("Rechnungsdruck").Width = 60 .Columns("Rechnungsdruck").Width = 60
.Columns("Rechnungsdruck").HeaderText = "Rg.Art" .Columns("Rechnungsdruck").HeaderText = "Rg.Art"
.Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter .Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
End If
.Columns("Betrag").DefaultCellStyle.Format = "C2"
End If End If
If cboFirma._value <> "" AndAlso cboFirma._value = "19" Then
.Columns("Betrag").DefaultCellStyle.Format = "C2"
End If
If cboFirma._value <> "" AndAlso cboFirma._value = "19" Then
For Each r In .Rows For Each r In .Rows
@@ -986,6 +987,10 @@ Public Class frmAbrechnungsMaske
Dim ListOfRK_ID As New List(Of Integer) Dim ListOfRK_ID As New List(Of Integer)
Dim noRE_DATE = dgvRechnungen.SelectedRows.Cast(Of DataGridViewRow)().Any(Function(r) r.Cells("RENR").Value Is Nothing OrElse IsDBNull(r.Cells("RENR").Value))
If noRE_DATE Then MsgBox("ACHTUNG, Rechnungsdatum wurde nicht gesetzt." & vbNewLine & "Vorgang wird abgebrochen!") : Exit Sub
For Each row As DataGridViewRow In dgvRechnungen.SelectedRows For Each row As DataGridViewRow In dgvRechnungen.SelectedRows
If Not IsDBNull(row.Cells("RK_ID").Value) AndAlso IsNumeric(row.Cells("RK_ID").Value) Then If Not IsDBNull(row.Cells("RK_ID").Value) AndAlso IsNumeric(row.Cells("RK_ID").Value) Then

156
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -5524,104 +5524,114 @@ mwst:
If cboRechnungAn._value = "" Then Return enableAUTOMAIL If cboRechnungAn._value = "" Then Return enableAUTOMAIL
If cboSammelrechnung._value <> 0 Then Return enableAUTOMAIL
Dim RD_DRUCK = -1 Dim RD_DRUCK = -1
Dim AD As cAdressen Dim AD As cAdressen
Select Case cboRechnungAn._value Select Case cboRechnungAn._value
Case "1" Case "1"
If kdFirmaAbsender.KdNr = "" Then Return enableAUTOMAIL If kdFirmaAbsender.KdNr = "" Then Return enableAUTOMAIL
AD = New cAdressen(kdFirmaAbsender.KdNr) AD = New cAdressen(kdFirmaAbsender.KdNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case "2" Case "2"
If kdFirmaEmpfaenger.KdNr = "" Then Return enableAUTOMAIL If kdFirmaEmpfaenger.KdNr = "" Then Return enableAUTOMAIL
AD = New cAdressen(kdFirmaEmpfaenger.KdNr) AD = New cAdressen(kdFirmaEmpfaenger.KdNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case "3" Case "3"
If kdFirmaAuftraggeber.KdNr = "" Then Return enableAUTOMAIL If kdFirmaAuftraggeber.KdNr = "" Then Return enableAUTOMAIL
AD = New cAdressen(kdFirmaAuftraggeber.KdNr) AD = New cAdressen(kdFirmaAuftraggeber.KdNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case "4" Case "4"
If kdFirmaAvisierer.KdNr = "" Then Return enableAUTOMAIL If kdFirmaAvisierer.KdNr = "" Then Return enableAUTOMAIL
AD = New cAdressen(kdFirmaAvisierer.KdNr) AD = New cAdressen(kdFirmaAvisierer.KdNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case Else Case Else
Return enableAUTOMAIL Return enableAUTOMAIL
End Select End Select
'BEI EINZELRECHNUNG WIRD STATUS 0 und 2 geprüft 'BEI EINZELRECHNUNG WIRD STATUS 0 und 2 geprüft
'STATUS 0-_> Rechnung angelegt
'STATUS 1-_> Einzel-Rg gedruckt
'STATUS 2-_> Anlagen zur Rg gedruckt
'STATUS 3-_> Sammel-Rg gedruckt
'STATUS 4-_> ? irgendwas mit SR 6 Maut/Diesel??
If cboSammelrechnung._value = 0 AndAlso lblDruckDatum.Text = "" AndAlso RD_DRUCK = 2 Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS??
If RECHNUNG IsNot Nothing AndAlso (RECHNUNG.Status <> 0 AndAlso RECHNUNG.Status <> 2) Then
Return enableAUTOMAIL = False
Else
enableAUTOMAIL = True
End If
'STATUS 0-_> Rechnung angelegt
'STATUS 1-_> Einzel-Rg gedruckt
'STATUS 2-_> Anlagen zur Rg gedruckt
'STATUS 3-_> Sammel-Rg gedruckt
'STATUS 4-_> ? irgendwas mit SR 6 Maut/Diesel??
If cboSammelrechnung._value = 0 AndAlso lblDruckDatum.Text = "" AndAlso RD_DRUCK = 2 Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS??
If RECHNUNG IsNot Nothing AndAlso (RECHNUNG.Status <> 0 AndAlso RECHNUNG.Status <> 2) Then
Return enableAUTOMAIL = False
Else Else
enableAUTOMAIL = True enableAUTOMAIL = False
End If End If
Else Else
enableAUTOMAIL = False
End If
Else
If RECHNUNG.Rechnung_an = 0 Then Return enableAUTOMAIL If RECHNUNG.Rechnung_an = 0 Then Return enableAUTOMAIL
If cboSammelrechnung._value <> 0 Then
Return enableAUTOMAIL
ElseIf RECHNUNG.Sammelrechnung <> 0 Then
Return enableAUTOMAIL
End If
Dim RD_DRUCK = -1 Dim RD_DRUCK = -1
Dim AD As cAdressen Dim AD As cAdressen
Select Case RECHNUNG.Rechnung_an Select Case RECHNUNG.Rechnung_an
Case 1 Case 1
If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL
AD = New cAdressen(RECHNUNG.AbsenderKundenNr) AD = New cAdressen(RECHNUNG.AbsenderKundenNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case 2 Case 2
If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL
AD = New cAdressen(RECHNUNG.EmpfängerKundenNr) AD = New cAdressen(RECHNUNG.EmpfängerKundenNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case 3 Case 3
If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL
AD = New cAdressen(RECHNUNG.VermittlerKundenNr) AD = New cAdressen(RECHNUNG.VermittlerKundenNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case 4 Case 4
If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL
AD = New cAdressen(RECHNUNG.AvisiererKundenNr) AD = New cAdressen(RECHNUNG.AvisiererKundenNr)
RD_DRUCK = If(AD.Rechnungsdruck, -1) RD_DRUCK = If(AD.Rechnungsdruck, -1)
Case Else Case Else
Return enableAUTOMAIL Return enableAUTOMAIL
End Select End Select
'BEI EINZELRECHNUNG WIRD STATUS 0 und 2 geprüft 'BEI EINZELRECHNUNG WIRD STATUS 0 und 2 geprüft
'STATUS 0-_> Rechnung angelegt 'STATUS 0-_> Rechnung angelegt
'STATUS 1-_> Einzel-Rg gedruckt 'STATUS 1-_> Einzel-Rg gedruckt
'STATUS 2-_> Anlagen zur Rg gedruckt 'STATUS 2-_> Anlagen zur Rg gedruckt
'STATUS 3-_> Sammel-Rg gedruckt 'STATUS 3-_> Sammel-Rg gedruckt
'STATUS 4-_> ? irgendwas mit SR 6 Maut/Diesel?? 'STATUS 4-_> ? irgendwas mit SR 6 Maut/Diesel??
If RECHNUNG.Sammelrechnung = 0 AndAlso RECHNUNG.DruckDatumZeit Is Nothing AndAlso RD_DRUCK = 2 AndAlso (RECHNUNG.Status = 0 Or RECHNUNG.Status = 2) Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS??
enableAUTOMAIL = True
Else
enableAUTOMAIL = False
End If
If RECHNUNG.Sammelrechnung = 0 AndAlso RECHNUNG.DruckDatumZeit Is Nothing AndAlso RD_DRUCK = 2 AndAlso (RECHNUNG.Status = 0 Or RECHNUNG.Status = 2) Then ' (RECHNUNG.Status <> 4 ANDAlso RECHNUNG.Status <> 0) WARUM NOCHMALS??
enableAUTOMAIL = True
Else
enableAUTOMAIL = False
End If End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
'Button8.Enabled = Not enableAUTOMAIL 'Button8.Enabled = Not enableAUTOMAIL
'Button9.Enabled = Not enableAUTOMAIL 'Button9.Enabled = Not enableAUTOMAIL
'Button4.Enabled = Not enableAUTOMAIL 'Button4.Enabled = Not enableAUTOMAIL

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.4.8")> <Assembly: AssemblyVersion("1.5.5.0")>
<Assembly: AssemblyFileVersion("1.5.4.8")> <Assembly: AssemblyFileVersion("1.5.5.0")>

7
SDL/SDL.vbproj
View File

@@ -104,8 +104,8 @@
<Reference Include="BouncyCastle.Crypto, Version=1.7.4137.9688, Culture=neutral, PublicKeyToken=a4292a325f69b123, processorArchitecture=MSIL"> <Reference Include="BouncyCastle.Crypto, Version=1.7.4137.9688, Culture=neutral, PublicKeyToken=a4292a325f69b123, processorArchitecture=MSIL">
<HintPath>..\..\..\Aviso\AVISO\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath> <HintPath>..\..\..\Aviso\AVISO\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
</Reference> </Reference>
<Reference Include="BouncyCastle.Cryptography"> <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll</HintPath> <HintPath>..\..\..\Aviso\AVISO\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference> </Reference>
<Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64"> <Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@@ -256,6 +256,9 @@
<Reference Include="itext.barcodes, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL"> <Reference Include="itext.barcodes, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\..\Aviso\AVISO\packages\itext.9.6.0\lib\net461\itext.barcodes.dll</HintPath> <HintPath>..\..\..\Aviso\AVISO\packages\itext.9.6.0\lib\net461\itext.barcodes.dll</HintPath>
</Reference> </Reference>
<Reference Include="itext.bouncy-castle-adapter, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\..\Aviso\AVISO\packages\itext.bouncy-castle-adapter.9.6.0\lib\net461\itext.bouncy-castle-adapter.dll</HintPath>
</Reference>
<Reference Include="itext.bouncy-castle-connector, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL"> <Reference Include="itext.bouncy-castle-connector, Version=9.6.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\..\Aviso\AVISO\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath> <HintPath>..\..\..\Aviso\AVISO\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath>
</Reference> </Reference>

23
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()
@@ -144,12 +141,12 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
End If End If
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. '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) ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
Me.FindForm.Close() Me.FindForm.Close()
End If End If
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
@@ -252,7 +249,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
@@ -286,15 +283,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

246
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
@@ -2394,24 +2394,24 @@ Public Class frmMDMDatenverarbetiung
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
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
@@ -2421,37 +2421,37 @@ Public Class frmMDMDatenverarbetiung
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")

2
SDL/packages.config
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle" version="1.7.0" targetFramework="net48" /> <package id="BouncyCastle" version="1.7.0" targetFramework="net48" />
<package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net48" />
<package id="ClosedXML" version="0.95.4" targetFramework="net47" /> <package id="ClosedXML" version="0.95.4" targetFramework="net47" />
<package id="Common.Logging" version="3.4.1" targetFramework="net48" /> <package id="Common.Logging" version="3.4.1" targetFramework="net48" />
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net48" /> <package id="Common.Logging.Core" version="3.4.1" targetFramework="net48" />
@@ -19,6 +20,7 @@
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40-Client" requireReinstallation="True" /> <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40-Client" requireReinstallation="True" />
<package id="IKVM" version="8.0.5449.1" targetFramework="net47" /> <package id="IKVM" version="8.0.5449.1" targetFramework="net47" />
<package id="itext" version="9.6.0" targetFramework="net48" /> <package id="itext" version="9.6.0" targetFramework="net48" />
<package id="itext.bouncy-castle-adapter" version="9.6.0" targetFramework="net48" />
<package id="itext.commons" version="9.6.0" targetFramework="net48" /> <package id="itext.commons" version="9.6.0" targetFramework="net48" />
<package id="itext7" version="9.6.0" targetFramework="net48" /> <package id="itext7" version="9.6.0" targetFramework="net48" />
<package id="LiveCharts" version="0.6.7.0" targetFramework="net40-Client" requireReinstallation="True" /> <package id="LiveCharts" version="0.6.7.0" targetFramework="net40-Client" requireReinstallation="True" />

4
VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb
View File

@@ -112,7 +112,7 @@ Public Class cAufschubKonten
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("SELECT * FROM tblBrgAufschubKonten WHERE brgakto_gs_standort=@brgakto_gs_standort " & IIf(firma <> 0, " AND brgakto_firma=@brgakto_firma", ""), conn) Using cmd As New SqlCommand("SELECT * FROM tblBrgAufschubKonten WHERE brgakto_gs_standort=@brgakto_gs_standort " & IIf(firma <> 0, " AND brgakto_firmaID=@brgakto_firmaID", ""), conn)
cmd.Parameters.AddWithValue("@brgakto_gs_standort", brgakto_gs_standort) cmd.Parameters.AddWithValue("@brgakto_gs_standort", brgakto_gs_standort)
If firma <> 0 Then cmd.Parameters.AddWithValue("@brgakto_firmaID", brgakto_firmaID) If firma <> 0 Then cmd.Parameters.AddWithValue("@brgakto_firmaID", brgakto_firmaID)
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
@@ -250,7 +250,7 @@ Public Class cAufschubKonten
Try Try
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,) Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
Catch ex As Exception Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)

41
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
View File

@@ -1007,40 +1007,15 @@ Public Class frmMessenger
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSendAtt.Click Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSendAtt.Click
If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
If CHAT IsNot Nothing Then If CHAT IsNot Nothing Then
Dim fd As New OpenFileDialog Using fd As New OpenFileDialog()
' fd.Filter = "Excel Dateien|*.xls;*.xlsx" fd.Title = "Datei auswählen"
fd.RestoreDirectory = True fd.RestoreDirectory = True
fd.Title = "Datei auswählen" fd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
' fd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
'fd.Filter = "Image Files(*.BMP;*.JPG;*.GIF;*.PNG)|*.BMP;*.JPG;*.GIF;*.PNG"
'fd.FilterIndex = 2
If fd.ShowDialog() = System.Windows.Forms.DialogResult.OK And fd.FileName <> "" Then
saveFileAtt(fd.FileName)
'Dim fileName = New System.IO.FileInfo(fd.FileName).Name
'Dim docId = -1
'If saveToDS(fileName, fd.FileName, docId) Then
' Dim MSG As New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_ChatMessages(CHAT.chat_id, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
' MSG.chatMg_type = "ATTACHMENT"
' MSG.chatMg_text = fileName
' MSG.chatMg_anhang_docId = docId
' MSG.chatMg_maName = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
' MSG.chatMg_maFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
' If MSG.SAVE(True, CHAT.CHAT_MEMBERS) Then
' SEND_TOKEN_NEW_MESSAGE()
' ' CHAT.CHAT_MESSAGES.Add(MSG)
' SET_ALL_READ()
' REFRESH_CHAT()
' rtbChatMessage.Text = ""
' rtbChatMessage.Focus()
' End If
' End If
End If
If fd.ShowDialog(Me) = DialogResult.OK AndAlso Not String.IsNullOrEmpty(fd.FileName) Then
saveFileAtt(fd.FileName)
End If
End Using
End If End If
End Sub End Sub

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