Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -29,7 +29,7 @@ Public Class cAutomailversand
|
||||
LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr
|
||||
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 & "'
|
||||
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
|
||||
ORDER BY RechnungsLandKz, RechnungsKundenNr"
|
||||
|
||||
@@ -39,7 +39,7 @@ Public Class cAutomailversand
|
||||
LEFT JOIN tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Rechnungsausgang.RechnungsKundenNr
|
||||
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 & "'
|
||||
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
|
||||
ORDER BY RechnungsLandKz, RechnungsKundenNr"
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
Imports System.IO
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class frmAbrechnungsMaske
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
@@ -53,7 +54,7 @@ Public Class frmAbrechnungsMaske
|
||||
FirmaTmp = "VERAGIMEX"
|
||||
End If
|
||||
|
||||
FirmaTmp = "AMBAR"
|
||||
'FirmaTmp = "AMBAR"
|
||||
|
||||
cboSachbearbeiter.Items.Clear()
|
||||
|
||||
@@ -246,22 +247,22 @@ Public Class frmAbrechnungsMaske
|
||||
End If
|
||||
|
||||
.Columns("UnterNr").Width = 35
|
||||
.Columns("Art").Width = 30
|
||||
.Columns("Betrag").Width = 100
|
||||
.Columns("Rechnungsempfänger").MinimumWidth = 150
|
||||
.Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("Art").Width = 30
|
||||
.Columns("Betrag").Width = 100
|
||||
.Columns("Rechnungsempfänger").MinimumWidth = 150
|
||||
.Columns("Rechnungsempfänger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
|
||||
If Not cbxGutschriftenAnVerag.Checked Then
|
||||
.Columns("Rechnungsdruck").Width = 60
|
||||
.Columns("Rechnungsdruck").HeaderText = "Rg.Art"
|
||||
.Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
End If
|
||||
|
||||
|
||||
.Columns("Betrag").DefaultCellStyle.Format = "C2"
|
||||
If Not cbxGutschriftenAnVerag.Checked Then
|
||||
.Columns("Rechnungsdruck").Width = 60
|
||||
.Columns("Rechnungsdruck").HeaderText = "Rg.Art"
|
||||
.Columns("Rechnungsdruck").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
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
|
||||
|
||||
@@ -986,6 +987,10 @@ Public Class frmAbrechnungsMaske
|
||||
|
||||
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
|
||||
|
||||
If Not IsDBNull(row.Cells("RK_ID").Value) AndAlso IsNumeric(row.Cells("RK_ID").Value) Then
|
||||
|
||||
@@ -5524,104 +5524,114 @@ mwst:
|
||||
|
||||
If cboRechnungAn._value = "" Then Return enableAUTOMAIL
|
||||
|
||||
If cboSammelrechnung._value <> 0 Then Return enableAUTOMAIL
|
||||
|
||||
|
||||
Dim RD_DRUCK = -1
|
||||
Dim AD As cAdressen
|
||||
Dim AD As cAdressen
|
||||
|
||||
Select Case cboRechnungAn._value
|
||||
Case "1"
|
||||
If kdFirmaAbsender.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAbsender.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "2"
|
||||
If kdFirmaEmpfaenger.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaEmpfaenger.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "3"
|
||||
If kdFirmaAuftraggeber.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAuftraggeber.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "4"
|
||||
If kdFirmaAvisierer.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAvisierer.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case Else
|
||||
Return enableAUTOMAIL
|
||||
End Select
|
||||
Select Case cboRechnungAn._value
|
||||
Case "1"
|
||||
If kdFirmaAbsender.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAbsender.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "2"
|
||||
If kdFirmaEmpfaenger.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaEmpfaenger.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "3"
|
||||
If kdFirmaAuftraggeber.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAuftraggeber.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case "4"
|
||||
If kdFirmaAvisierer.KdNr = "" Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(kdFirmaAvisierer.KdNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case Else
|
||||
Return enableAUTOMAIL
|
||||
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
|
||||
enableAUTOMAIL = True
|
||||
enableAUTOMAIL = False
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
enableAUTOMAIL = False
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
|
||||
|
||||
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 AD As cAdressen
|
||||
Select Case RECHNUNG.Rechnung_an
|
||||
Case 1
|
||||
If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.AbsenderKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 2
|
||||
If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.EmpfängerKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 3
|
||||
If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.VermittlerKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 4
|
||||
If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.AvisiererKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case Else
|
||||
Return enableAUTOMAIL
|
||||
End Select
|
||||
Dim AD As cAdressen
|
||||
Select Case RECHNUNG.Rechnung_an
|
||||
Case 1
|
||||
If RECHNUNG.AbsenderKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.AbsenderKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 2
|
||||
If RECHNUNG.EmpfängerKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.EmpfängerKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 3
|
||||
If RECHNUNG.VermittlerKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.VermittlerKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case 4
|
||||
If RECHNUNG.AvisiererKundenNr Is Nothing Then Return enableAUTOMAIL
|
||||
AD = New cAdressen(RECHNUNG.AvisiererKundenNr)
|
||||
RD_DRUCK = If(AD.Rechnungsdruck, -1)
|
||||
Case Else
|
||||
Return enableAUTOMAIL
|
||||
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??
|
||||
'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 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
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
|
||||
'Button8.Enabled = Not enableAUTOMAIL
|
||||
'Button9.Enabled = Not enableAUTOMAIL
|
||||
'Button4.Enabled = Not enableAUTOMAIL
|
||||
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.5.4.8")>
|
||||
<Assembly: AssemblyFileVersion("1.5.4.8")>
|
||||
<Assembly: AssemblyVersion("1.5.5.0")>
|
||||
<Assembly: AssemblyFileVersion("1.5.5.0")>
|
||||
|
||||
@@ -104,8 +104,8 @@
|
||||
<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>
|
||||
</Reference>
|
||||
<Reference Include="BouncyCastle.Cryptography">
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\ActiveReports18\allDll\BouncyCastle.Cryptography.dll</HintPath>
|
||||
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\Aviso\AVISO\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@@ -256,6 +256,9 @@
|
||||
<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>
|
||||
</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">
|
||||
<HintPath>..\..\..\Aviso\AVISO\packages\itext.9.6.0\lib\net461\itext.bouncy-castle-connector.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@@ -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
|
||||
@@ -252,7 +249,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
|
||||
|
||||
@@ -286,15 +283,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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -2394,24 +2394,24 @@ Public Class frmMDMDatenverarbetiung
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
|
||||
|
||||
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
|
||||
@@ -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) "
|
||||
' "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()
|
||||
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)
|
||||
|
||||
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")
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<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="Common.Logging" 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="IKVM" version="8.0.5449.1" targetFramework="net47" />
|
||||
<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="itext7" version="9.6.0" targetFramework="net48" />
|
||||
<package id="LiveCharts" version="0.6.7.0" targetFramework="net40-Client" requireReinstallation="True" />
|
||||
|
||||
@@ -112,7 +112,7 @@ Public Class cAufschubKonten
|
||||
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)
|
||||
If firma <> 0 Then cmd.Parameters.AddWithValue("@brgakto_firmaID", brgakto_firmaID)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
@@ -250,7 +250,7 @@ Public Class cAufschubKonten
|
||||
|
||||
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
|
||||
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
||||
|
||||
@@ -1007,40 +1007,15 @@ Public Class frmMessenger
|
||||
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 CHAT IsNot Nothing Then
|
||||
Dim fd As New OpenFileDialog
|
||||
' fd.Filter = "Excel Dateien|*.xls;*.xlsx"
|
||||
fd.RestoreDirectory = True
|
||||
fd.Title = "Datei auswählen"
|
||||
|
||||
' 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
|
||||
Using fd As New OpenFileDialog()
|
||||
fd.Title = "Datei auswählen"
|
||||
fd.RestoreDirectory = True
|
||||
fd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
|
||||
|
||||
If fd.ShowDialog(Me) = DialogResult.OK AndAlso Not String.IsNullOrEmpty(fd.FileName) Then
|
||||
saveFileAtt(fd.FileName)
|
||||
End If
|
||||
End Using
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user