From d8d16b1aad5317f24b3d68235df40d72e22f0463 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 15 Jan 2026 11:05:15 +0100 Subject: [PATCH 1/6] gesamtsicherheiten --- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 48 +++++++++--- Aviso/frmGesamtsicherheitenMenuNEU.vb | 78 ++++++++++++++++++- Aviso/frmGesamtsicherheitenNEU.vb | 43 ++++++++-- 3 files changed, 151 insertions(+), 18 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index a9e44c6..7dd3b23 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -22,13 +22,15 @@ Partial Class frmGesamtsicherheitenMenuNEU 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenMenuNEU)) - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.Label26 = New System.Windows.Forms.Label() @@ -54,7 +56,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -63,7 +65,9 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -72,15 +76,15 @@ Partial Class frmGesamtsicherheitenMenuNEU ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 92) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(203, 114) ' 'ExportCSVToolStripMenuItem ' Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem}) Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem" - Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(191, 22) + Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(202, 22) Me.ExportCSVToolStripMenuItem.Text = "Export CSV" ' 'ListeToolStripMenuItem @@ -104,9 +108,15 @@ Partial Class frmGesamtsicherheitenMenuNEU 'SaldenNeuBerechnenToolStripMenuItem ' Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem" - Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22) + Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(202, 22) Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen" ' + 'SaldoZumStichtagToolStripMenuItem + ' + Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem" + Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag" + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -604,11 +614,24 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnNeu.Text = "Neu" Me.btnNeu.UseVisualStyleBackColor = False ' - 'SaldoZumStichtagToolStripMenuItem + 'PrüfungAusPlausibilitätToolStripMenuItem ' - Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem" - Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(191, 22) - Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag" + Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem}) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem" + Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung aus Plausibilität" + ' + 'AusgangEingangToolStripMenuItem + ' + Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" + Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" + ' + 'SicherheitsbetragToolStripMenuItem + ' + Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" + Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" ' 'frmGesamtsicherheitenMenuNEU ' @@ -674,4 +697,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents DetaillisteToolStripMenuItem As ToolStripMenuItem Friend WithEvents PictureBox5 As PictureBox Friend WithEvents SaldoZumStichtagToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PrüfungAusPlausibilitätToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AusgangEingangToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 24d285b..d8c1c6b 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -317,6 +317,7 @@ Public Class frmGesamtsicherheitenMenuNEU DateTimePicker1.Value = JAHR DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) 'End If + Case "Tag" Case "Tag" DateTimePicker1.Value = TAG @@ -524,14 +525,14 @@ Public Class frmGesamtsicherheitenMenuNEU 'End If If sender.ToString = "Detailliste" Then - frm.LoadDataTableSicherheitenForExport2(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) + frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) ElseIf sender.ToString = "Referenzliste-Zollamt" Then If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then detailINfo = False End If - frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) + frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) Else MsgBox("Funktion nicht definiert!") Exit Sub @@ -590,4 +591,77 @@ Public Class frmGesamtsicherheitenMenuNEU End Sub + + Private Sub AusgangEingangToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusgangEingangToolStripMenuItem.Click + + + + Dim SQLPlausPruefung = "select gs_gsnr as Nr,gs_ATBNr as ATBNr, gs_Sicherheitsbetrag as Sicherheitsbetrag ,gsp_ATCNr as ATCNr , cast(gs_datum as Date) as Ausgangsdatum, cast(gsp_datum as Date) as Eingangsdatum, [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer from tblGesamtsicherheit + inner join tblGesamtsicherheitsPositionen on gs_gsId = gsp_gsId + where cast(gsp_datum as Date) < cast(gs_datum as Date) and not ( [gs_sicherheitsbetrag] = 0.00 and [gsp_sicherheitsbetrag] = 0.00) and gs_standort = '" & Standort & "'" + + + Dim dt As New DataTable + dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True) + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (Datum/Uhrzeit des Gestellungsausganges muss zeitlich NACH dem Gestellungseingang liegen)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.") + SDL.cProgramFunctions.genExcelFromDT_NEW(dt) + + Else + + MsgBox("keine fehlerhaften Eingaben vorhanden!") + + End If + + + End Sub + + + Private Sub SicherheitsbetragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SicherheitsbetragToolStripMenuItem.Click + + + Dim SQLPlausPruefung = "SELECT + gs.gs_gsnr, + gs.Sicherheitbetrag_Ausgang, + gsp.Sicherheitbetrag_Eingang, + gs.gs_standort +FROM +( + SELECT + gs_gsnr, + gs_standort, + SUM(gs_sicherheitsbetrag) AS Sicherheitbetrag_Ausgang + FROM tblGesamtsicherheit + GROUP BY gs_standort, gs_gsnr +) gs +JOIN +( + SELECT + gsp_gsnr, + SUM(gsp_sicherheitsbetrag) AS Sicherheitbetrag_Eingang + FROM tblGesamtsicherheitsPositionen + GROUP BY gsp_gsnr +) gsp + ON gs.gs_gsnr = gsp.gsp_gsnr WHERE gs.Sicherheitbetrag_Ausgang < gsp.Sicherheitbetrag_Eingang and gs_standort = '" & Standort & "' and gs_gsnr <> 2030 order by gs.gs_gsnr" + + + Dim dt As New DataTable + dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True) + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (S-Betrag des Gestellungseinganges darf nicht größer als der des dem Gestellungsausganges)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.") + SDL.cProgramFunctions.genExcelFromDT_NEW(dt) + + Else + + MsgBox("keine fehlerhaften Eingaben vorhanden!") + + End If + + End Sub End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index eccaf69..02aa0a6 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -226,7 +226,7 @@ Public Class frmGesamtsicherheitenNEU End Sub - Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) + Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) Me.Cursor = Cursors.WaitCursor @@ -247,8 +247,7 @@ Public Class frmGesamtsicherheitenNEU Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheit] - Where [gs_gsnr] In (" & gsnr & ") - and isnull(gs_warenwert,0) <> 0 + Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 UNION Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] @@ -256,7 +255,28 @@ Public Class frmGesamtsicherheitenNEU and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") & "order by Temp.Datum, Temp.Uhrzeit " - dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True) + + + Dim SQLStringSicherheit_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " + From [tblGesamtsicherheit] + Where + [gs_gsnr] In ( + SELECT [gs_gsnr] + FROM tblGesamtsicherheit + WHERE gs_standort = '" & standort & "'AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' ) + and isnull(gs_sicherheitsbetrag,0) <> 0 + and gs_datum is not null + UNION + Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] + Where gsp_gsnr In ( + + SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' + + ) and isnull(gsp_sicherheitsbetrag,0) <> 0 + and gsp_datum is not null + ) as Temp order by Temp.Datum, Temp.Uhrzeit " + + dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new, "AVISO", 100, True) dtSicherheiten.Columns.Add("Saldo") @@ -306,7 +326,7 @@ Public Class frmGesamtsicherheitenNEU - Public Sub LoadDataTableSicherheitenForExport2(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) + Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) Me.Cursor = Cursors.WaitCursor @@ -333,6 +353,19 @@ Public Class frmGesamtsicherheitenNEU OR gsp_zuletztgeandert is not null and cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_gsId" + + Dim SQLStringSicherheit_new As String = " select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', + [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" & + IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") & + "From tblGesamtsicherheit + Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 + left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId + where [gs_gsnr] IN (SELECT gs_gsnr FROM tblGesamtsicherheit WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )) AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "'" & IIf(nurErstellungisNichtAenderungsdatum, " AND ( + (cast(gs_datum as Date) <> cast(gs_erstellungsdatum as Date) OR gs_zuletztgeandert is not null and cast(gs_datum as Date) <> cast(gs_zuletztgeandert as Date)) + OR gsp_zuletztgeandert is not null and cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_gsId" + + + dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True) From c78a6f6f84d59ce3aa78be2d4c4c02b28382e533 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 16 Jan 2026 15:14:13 +0100 Subject: [PATCH 2/6] gesamtischerheiten, etc. --- Aviso/My Project/AssemblyInfo.vb | 4 +- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 355 +++++++++--------- Aviso/frmGesamtsicherheitenMenuNEU.vb | 42 ++- Aviso/frmGesamtsicherheitenNEU.vb | 120 ++++-- 4 files changed, 321 insertions(+), 200 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 02e7766..5b157f0 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 7dd3b23..a79f827 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -29,14 +29,21 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RLZollamtBereinigtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SaldoZumStichtagToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label26 = New System.Windows.Forms.Label() Me.btnBisTag = New System.Windows.Forms.Button() Me.btnVonTag = New System.Windows.Forms.Button() Me.btnTag = New System.Windows.Forms.Button() + Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label24 = New System.Windows.Forms.Label() Me.btnJahr = New System.Windows.Forms.Button() Me.btnBisJahr = New System.Windows.Forms.Button() @@ -47,27 +54,22 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() Me.Label25 = New System.Windows.Forms.Label() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() + Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblFiliale = New System.Windows.Forms.Label() + Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label1 = New System.Windows.Forms.Label() + Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtSuchbegriff = New System.Windows.Forms.TextBox() Me.chkOffen = New System.Windows.Forms.CheckBox() + Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblSaldo = New System.Windows.Forms.Label() Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.btnNeu = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.PrüfungAusPlausibilitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AusgangEingangToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.SicherheitsbetragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.MehrfacheATBNrToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -78,45 +80,70 @@ Partial Class frmGesamtsicherheitenMenuNEU ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem, Me.PrüfungAusPlausibilitätToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(203, 114) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(202, 114) ' 'ExportCSVToolStripMenuItem ' - Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem}) + Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem, Me.RLZollamtBereinigtToolStripMenuItem}) Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem" - Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.ExportCSVToolStripMenuItem.Text = "Export CSV" ' 'ListeToolStripMenuItem ' Me.ListeToolStripMenuItem.Name = "ListeToolStripMenuItem" - Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(186, 22) + Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(183, 22) Me.ListeToolStripMenuItem.Text = "Liste" ' 'DetaillisteToolStripMenuItem ' Me.DetaillisteToolStripMenuItem.Name = "DetaillisteToolStripMenuItem" - Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(186, 22) + Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(183, 22) Me.DetaillisteToolStripMenuItem.Text = "Detailliste" ' 'ReferenzlisteZollamtToolStripMenuItem ' Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem" - Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22) - Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt" + Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(183, 22) + Me.ReferenzlisteZollamtToolStripMenuItem.Text = "RL-Zollamt" + ' + 'RLZollamtBereinigtToolStripMenuItem + ' + Me.RLZollamtBereinigtToolStripMenuItem.Name = "RLZollamtBereinigtToolStripMenuItem" + Me.RLZollamtBereinigtToolStripMenuItem.Size = New System.Drawing.Size(183, 22) + Me.RLZollamtBereinigtToolStripMenuItem.Text = "RL-Zollamt bereinigt" ' 'SaldenNeuBerechnenToolStripMenuItem ' Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem" - Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen" ' 'SaldoZumStichtagToolStripMenuItem ' Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem" - Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(202, 22) + Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(201, 22) Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag" ' + 'PrüfungAusPlausibilitätToolStripMenuItem + ' + Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem, Me.MehrfacheATBNrToolStripMenuItem}) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem" + Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(201, 22) + Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung auf Plausibilität" + ' + 'AusgangEingangToolStripMenuItem + ' + Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" + Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" + ' + 'SicherheitsbetragToolStripMenuItem + ' + Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" + Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -168,6 +195,46 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.PictureBox5.TabIndex = 132 Me.PictureBox5.TabStop = False ' + 'btnOpenOver85Days + ' + Me.btnOpenOver85Days.allowBorder = False + Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White + Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 + Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black + Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210) + Me.btnOpenOver85Days.Name = "btnOpenOver85Days" + Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) + Me.btnOpenOver85Days.TabIndex = 32 + Me.btnOpenOver85Days.Text = "Über 85 Tage offen" + Me.btnOpenOver85Days.UseVisualStyleBackColor = False + Me.btnOpenOver85Days.Visible = False + ' + 'txtDatBis + ' + Me.txtDatBis._DateTimeOnly = False + Me.txtDatBis._numbersOnly = False + Me.txtDatBis._numbersOnlyKommastellen = "" + Me.txtDatBis._numbersOnlyTrennzeichen = True + Me.txtDatBis._Prozent = False + Me.txtDatBis._ShortDateNew = False + Me.txtDatBis._ShortDateOnly = True + Me.txtDatBis._TimeOnly = False + Me.txtDatBis._TimeOnly_Seconds = False + Me.txtDatBis._value = "" + Me.txtDatBis._Waehrung = False + Me.txtDatBis._WaehrungZeichen = True + Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtDatBis.ForeColor = System.Drawing.Color.Black + Me.txtDatBis.Location = New System.Drawing.Point(62, 170) + Me.txtDatBis.MaxLength = 10 + Me.txtDatBis.MaxLineLength = -1 + Me.txtDatBis.MaxLines_Warning = "" + Me.txtDatBis.MaxLines_Warning_Label = Nothing + Me.txtDatBis.Name = "txtDatBis" + Me.txtDatBis.Size = New System.Drawing.Size(63, 20) + Me.txtDatBis.TabIndex = 25 + ' 'Label26 ' Me.Label26.AutoSize = True @@ -226,6 +293,31 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnTag.Text = "Heute" Me.btnTag.UseVisualStyleBackColor = False ' + 'txtDatVon + ' + Me.txtDatVon._DateTimeOnly = False + Me.txtDatVon._numbersOnly = False + Me.txtDatVon._numbersOnlyKommastellen = "" + Me.txtDatVon._numbersOnlyTrennzeichen = True + Me.txtDatVon._Prozent = False + Me.txtDatVon._ShortDateNew = False + Me.txtDatVon._ShortDateOnly = True + Me.txtDatVon._TimeOnly = False + Me.txtDatVon._TimeOnly_Seconds = False + Me.txtDatVon._value = "" + Me.txtDatVon._Waehrung = False + Me.txtDatVon._WaehrungZeichen = True + Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtDatVon.ForeColor = System.Drawing.Color.Black + Me.txtDatVon.Location = New System.Drawing.Point(62, 146) + Me.txtDatVon.MaxLength = 10 + Me.txtDatVon.MaxLineLength = -1 + Me.txtDatVon.MaxLines_Warning = "" + Me.txtDatVon.MaxLines_Warning_Label = Nothing + Me.txtDatVon.Name = "txtDatVon" + Me.txtDatVon.Size = New System.Drawing.Size(63, 20) + Me.txtDatVon.TabIndex = 18 + ' 'Label24 ' Me.Label24.AutoSize = True @@ -362,6 +454,18 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.DateTimePicker1.Size = New System.Drawing.Size(92, 20) Me.DateTimePicker1.TabIndex = 17 ' + 'cbxWarenort + ' + Me.cbxWarenort._allowedValuesFreiText = Nothing + Me.cbxWarenort._allowFreiText = False + Me.cbxWarenort._value = "" + Me.cbxWarenort.DropDownWidth = 500 + Me.cbxWarenort.FormattingEnabled = True + Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) + Me.cbxWarenort.Name = "cbxWarenort" + Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) + Me.cbxWarenort.TabIndex = 8 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -373,6 +477,18 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label4.TabIndex = 5 Me.Label4.Text = "Warenort:" ' + 'cbxStandort + ' + Me.cbxStandort._allowedValuesFreiText = Nothing + Me.cbxStandort._allowFreiText = False + Me.cbxStandort._value = "" + Me.cbxStandort.DropDownWidth = 200 + Me.cbxStandort.FormattingEnabled = True + Me.cbxStandort.Location = New System.Drawing.Point(32, 69) + Me.cbxStandort.Name = "cbxStandort" + Me.cbxStandort.Size = New System.Drawing.Size(81, 21) + Me.cbxStandort.TabIndex = 7 + ' 'lblFiliale ' Me.lblFiliale.AutoSize = True @@ -384,6 +500,20 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblFiliale.TabIndex = 4 Me.lblFiliale.Text = "Filiale:" ' + 'btnSucheStarten + ' + Me.btnSucheStarten.allowBorder = False + Me.btnSucheStarten.BackColor = System.Drawing.Color.White + Me.btnSucheStarten.FlatAppearance.BorderSize = 0 + Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black + Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254) + Me.btnSucheStarten.Name = "btnSucheStarten" + Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) + Me.btnSucheStarten.TabIndex = 33 + Me.btnSucheStarten.Text = "Suche starten" + Me.btnSucheStarten.UseVisualStyleBackColor = False + ' 'Label1 ' Me.Label1.AutoSize = True @@ -395,6 +525,20 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.Label1.TabIndex = 0 Me.Label1.Text = "Suche:" ' + 'btnResetFilter + ' + Me.btnResetFilter.allowBorder = False + Me.btnResetFilter.BackColor = System.Drawing.Color.White + Me.btnResetFilter.FlatAppearance.BorderSize = 0 + Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnResetFilter.ForeColor = System.Drawing.Color.Black + Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh + Me.btnResetFilter.Location = New System.Drawing.Point(283, 21) + Me.btnResetFilter.Name = "btnResetFilter" + Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) + Me.btnResetFilter.TabIndex = 3 + Me.btnResetFilter.UseVisualStyleBackColor = False + ' 'txtSuchbegriff ' Me.txtSuchbegriff.Location = New System.Drawing.Point(32, 28) @@ -415,6 +559,21 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.chkOffen.Text = "nur offene anzeigen" Me.chkOffen.UseVisualStyleBackColor = True ' + 'btnNeu + ' + Me.btnNeu.allowBorder = False + Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnNeu.BackColor = System.Drawing.Color.White + Me.btnNeu.FlatAppearance.BorderSize = 0 + Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNeu.ForeColor = System.Drawing.Color.Black + Me.btnNeu.Location = New System.Drawing.Point(571, 253) + Me.btnNeu.Name = "btnNeu" + Me.btnNeu.Size = New System.Drawing.Size(75, 23) + Me.btnNeu.TabIndex = 34 + Me.btnNeu.Text = "Neu" + Me.btnNeu.UseVisualStyleBackColor = False + ' 'lblSaldo ' Me.lblSaldo.Anchor = System.Windows.Forms.AnchorStyles.Right @@ -481,157 +640,11 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Size = New System.Drawing.Size(658, 394) Me.dgvListe.TabIndex = 1 ' - 'btnOpenOver85Days + 'MehrfacheATBNrToolStripMenuItem ' - Me.btnOpenOver85Days.allowBorder = False - Me.btnOpenOver85Days.BackColor = System.Drawing.Color.White - Me.btnOpenOver85Days.FlatAppearance.BorderSize = 0 - Me.btnOpenOver85Days.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOpenOver85Days.ForeColor = System.Drawing.Color.Black - Me.btnOpenOver85Days.Location = New System.Drawing.Point(196, 210) - Me.btnOpenOver85Days.Name = "btnOpenOver85Days" - Me.btnOpenOver85Days.Size = New System.Drawing.Size(116, 20) - Me.btnOpenOver85Days.TabIndex = 32 - Me.btnOpenOver85Days.Text = "Über 85 Tage offen" - Me.btnOpenOver85Days.UseVisualStyleBackColor = False - Me.btnOpenOver85Days.Visible = False - ' - 'txtDatBis - ' - Me.txtDatBis._DateTimeOnly = False - Me.txtDatBis._numbersOnly = False - Me.txtDatBis._numbersOnlyKommastellen = "" - Me.txtDatBis._numbersOnlyTrennzeichen = True - Me.txtDatBis._Prozent = False - Me.txtDatBis._ShortDateNew = False - Me.txtDatBis._ShortDateOnly = True - Me.txtDatBis._TimeOnly = False - Me.txtDatBis._TimeOnly_Seconds = False - Me.txtDatBis._value = "" - Me.txtDatBis._Waehrung = False - Me.txtDatBis._WaehrungZeichen = True - Me.txtDatBis.Enabled = False - Me.txtDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtDatBis.ForeColor = System.Drawing.Color.Black - Me.txtDatBis.Location = New System.Drawing.Point(62, 170) - Me.txtDatBis.MaxLength = 10 - Me.txtDatBis.MaxLineLength = -1 - Me.txtDatBis.MaxLines_Warning = "" - Me.txtDatBis.MaxLines_Warning_Label = Nothing - Me.txtDatBis.Name = "txtDatBis" - Me.txtDatBis.Size = New System.Drawing.Size(63, 20) - Me.txtDatBis.TabIndex = 25 - ' - 'txtDatVon - ' - Me.txtDatVon._DateTimeOnly = False - Me.txtDatVon._numbersOnly = False - Me.txtDatVon._numbersOnlyKommastellen = "" - Me.txtDatVon._numbersOnlyTrennzeichen = True - Me.txtDatVon._Prozent = False - Me.txtDatVon._ShortDateNew = False - Me.txtDatVon._ShortDateOnly = True - Me.txtDatVon._TimeOnly = False - Me.txtDatVon._TimeOnly_Seconds = False - Me.txtDatVon._value = "" - Me.txtDatVon._Waehrung = False - Me.txtDatVon._WaehrungZeichen = True - Me.txtDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtDatVon.ForeColor = System.Drawing.Color.Black - Me.txtDatVon.Location = New System.Drawing.Point(62, 146) - Me.txtDatVon.MaxLength = 10 - Me.txtDatVon.MaxLineLength = -1 - Me.txtDatVon.MaxLines_Warning = "" - Me.txtDatVon.MaxLines_Warning_Label = Nothing - Me.txtDatVon.Name = "txtDatVon" - Me.txtDatVon.Size = New System.Drawing.Size(63, 20) - Me.txtDatVon.TabIndex = 18 - ' - 'cbxWarenort - ' - Me.cbxWarenort._allowedValuesFreiText = Nothing - Me.cbxWarenort._allowFreiText = False - Me.cbxWarenort._value = "" - Me.cbxWarenort.DropDownWidth = 500 - Me.cbxWarenort.FormattingEnabled = True - Me.cbxWarenort.Location = New System.Drawing.Point(132, 69) - Me.cbxWarenort.Name = "cbxWarenort" - Me.cbxWarenort.Size = New System.Drawing.Size(81, 21) - Me.cbxWarenort.TabIndex = 8 - ' - 'cbxStandort - ' - Me.cbxStandort._allowedValuesFreiText = Nothing - Me.cbxStandort._allowFreiText = False - Me.cbxStandort._value = "" - Me.cbxStandort.DropDownWidth = 200 - Me.cbxStandort.FormattingEnabled = True - Me.cbxStandort.Location = New System.Drawing.Point(32, 69) - Me.cbxStandort.Name = "cbxStandort" - Me.cbxStandort.Size = New System.Drawing.Size(81, 21) - Me.cbxStandort.TabIndex = 7 - ' - 'btnSucheStarten - ' - Me.btnSucheStarten.allowBorder = False - Me.btnSucheStarten.BackColor = System.Drawing.Color.White - Me.btnSucheStarten.FlatAppearance.BorderSize = 0 - Me.btnSucheStarten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSucheStarten.ForeColor = System.Drawing.Color.Black - Me.btnSucheStarten.Location = New System.Drawing.Point(32, 254) - Me.btnSucheStarten.Name = "btnSucheStarten" - Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20) - Me.btnSucheStarten.TabIndex = 33 - Me.btnSucheStarten.Text = "Suche starten" - Me.btnSucheStarten.UseVisualStyleBackColor = False - ' - 'btnResetFilter - ' - Me.btnResetFilter.allowBorder = False - Me.btnResetFilter.BackColor = System.Drawing.Color.White - Me.btnResetFilter.FlatAppearance.BorderSize = 0 - Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnResetFilter.ForeColor = System.Drawing.Color.Black - Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh - Me.btnResetFilter.Location = New System.Drawing.Point(283, 21) - Me.btnResetFilter.Name = "btnResetFilter" - Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) - Me.btnResetFilter.TabIndex = 3 - Me.btnResetFilter.UseVisualStyleBackColor = False - ' - 'btnNeu - ' - Me.btnNeu.allowBorder = False - Me.btnNeu.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.btnNeu.BackColor = System.Drawing.Color.White - Me.btnNeu.FlatAppearance.BorderSize = 0 - Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNeu.ForeColor = System.Drawing.Color.Black - Me.btnNeu.Location = New System.Drawing.Point(571, 253) - Me.btnNeu.Name = "btnNeu" - Me.btnNeu.Size = New System.Drawing.Size(75, 23) - Me.btnNeu.TabIndex = 34 - Me.btnNeu.Text = "Neu" - Me.btnNeu.UseVisualStyleBackColor = False - ' - 'PrüfungAusPlausibilitätToolStripMenuItem - ' - Me.PrüfungAusPlausibilitätToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusgangEingangToolStripMenuItem, Me.SicherheitsbetragToolStripMenuItem}) - Me.PrüfungAusPlausibilitätToolStripMenuItem.Name = "PrüfungAusPlausibilitätToolStripMenuItem" - Me.PrüfungAusPlausibilitätToolStripMenuItem.Size = New System.Drawing.Size(202, 22) - Me.PrüfungAusPlausibilitätToolStripMenuItem.Text = "Prüfung aus Plausibilität" - ' - 'AusgangEingangToolStripMenuItem - ' - Me.AusgangEingangToolStripMenuItem.Name = "AusgangEingangToolStripMenuItem" - Me.AusgangEingangToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.AusgangEingangToolStripMenuItem.Text = "Ausgang < Eingang" - ' - 'SicherheitsbetragToolStripMenuItem - ' - Me.SicherheitsbetragToolStripMenuItem.Name = "SicherheitsbetragToolStripMenuItem" - Me.SicherheitsbetragToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.SicherheitsbetragToolStripMenuItem.Text = "Sicherheitsbetrag" + Me.MehrfacheATBNrToolStripMenuItem.Name = "MehrfacheATBNrToolStripMenuItem" + Me.MehrfacheATBNrToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.MehrfacheATBNrToolStripMenuItem.Text = "mehrfache ATB-Nr" ' 'frmGesamtsicherheitenMenuNEU ' @@ -700,4 +713,6 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents PrüfungAusPlausibilitätToolStripMenuItem As ToolStripMenuItem Friend WithEvents AusgangEingangToolStripMenuItem As ToolStripMenuItem Friend WithEvents SicherheitsbetragToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RLZollamtBereinigtToolStripMenuItem As ToolStripMenuItem + Friend WithEvents MehrfacheATBNrToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index d8c1c6b..d7d2561 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -500,7 +500,7 @@ Public Class frmGesamtsicherheitenMenuNEU End Sub - Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click + Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click, RLZollamtBereinigtToolStripMenuItem.Click If dgvListe.Rows.Count = 0 Then MsgBox("keine Daten vorhanden!") @@ -519,6 +519,9 @@ Public Class frmGesamtsicherheitenMenuNEU Dim detailINfo As Boolean = True + Dim zollliste_bereinigt As Boolean = False + + 'Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False 'If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then ' nurErstellungsdatumNotAenderungsdatum = True @@ -526,19 +529,20 @@ Public Class frmGesamtsicherheitenMenuNEU If sender.ToString = "Detailliste" Then frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) - ElseIf sender.ToString = "Referenzliste-Zollamt" Then + ElseIf sender.ToString = "RL-Zollamt" OrElse sender.ToString = "RL-Zollamt bereinigt" Then + zollliste_bereinigt = IIf(sender.ToString = "RL-Zollamt bereinigt", True, False) If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then detailINfo = False End If - frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum) + frm.LoadDataTableSicherheitenForZollamt(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, zollliste_bereinigt) Else MsgBox("Funktion nicht definiert!") Exit Sub End If - SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten) + If Not zollliste_bereinigt Then SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten) End Sub @@ -664,4 +668,34 @@ JOIN End If End Sub + + Private Sub MehrfacheATBNrToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MehrfacheATBNrToolStripMenuItem.Click + + + Dim SQLPlausPruefung = " select Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum from (select gs_ATBNr, gs_standort, cast(MIN(gs_datum) as Date) as Datum from tblGesamtsicherheit + where gs_standort = '" & Standort & "' AND cast(gs_datum as Date) <= '" & Date.Parse(txtDatBis.Text) & "' + group by gs_ATBNr, gs_posNr, gs_standort + Having count(*) > 1 + ) as Temp + group by Temp.gs_ATBNr, Temp.gs_standort, Temp.Datum + order by temp.Datum" + + + + Dim dt As New DataTable + dt = SQL.loadDgvBySql(SQLPlausPruefung, "AVISO", 100, True) + + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + MsgBox(dt.Rows.Count & " Datensätze müssen korrigiert werden (mehrfache ATB-Einträge pro ATB-Nr)! " & vbNewLine & "Ansonsten können keine korrekten Werte über die Saldenliste ermittelt werden.") + SDL.cProgramFunctions.genExcelFromDT_NEW(dt) + + Else + + MsgBox("keine fehlerhaften Eingaben vorhanden!") + + End If + + End Sub End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 02aa0a6..c5a7c10 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -1,4 +1,5 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports GrapeCity.Enterprise.Data.Expressions.Tools +Imports VERAG_PROG_ALLGEMEIN Public Class frmGesamtsicherheitenNEU @@ -226,34 +227,34 @@ Public Class frmGesamtsicherheitenNEU End Sub - Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False) + Public Sub LoadDataTableSicherheitenForZollamt(list As List(Of Integer), datumVon As Date, datumBis As Date, standort As String, Optional detailinfo As Boolean = False, Optional ausfVonBisEingeschraenkt As Boolean = False) Me.Cursor = Cursors.WaitCursor Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort) - Dim gsnr As String - Dim counter = 0 - For Each n In list - gsnr &= n.ToString() - counter = counter + 1 - If (list.Count <> 0 And counter <> list.Count) Then - gsnr &= "," - End If + 'Dim gsnr As String + 'Dim counter = 0 + 'For Each n In list + ' gsnr &= n.ToString() + ' counter = counter + 1 + ' If (list.Count <> 0 And counter <> list.Count) Then + ' gsnr &= "," + ' End If - Next + 'Next - Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " - From [tblGesamtsicherheit] - Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 - UNION - Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & - " From [tblGesamtsicherheitsPositionen] - where [gsp_gsnr] In (" & gsnr & ") - and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") & - "order by Temp.Datum, Temp.Uhrzeit " + 'Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " + ' From [tblGesamtsicherheit] + ' Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 + ' UNION + ' Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & + ' " From [tblGesamtsicherheitsPositionen] + ' where [gsp_gsnr] In (" & gsnr & ") + ' and isnull(gsp_warenwert,0) <> 0 ) as Temp WHERE Temp.Datum > '" & datumVon.ToShortDateString & "' and Temp.Datum <= '" & datumBis.ToShortDateString & "' " & IIf(nurErstellungisNichtAenderungsdatum, " AND (Temp.Erstellungsdatum is not null AND cast(Temp.Erstellungsdatum as Date) <> cast(Temp.Datum as Date)) OR (Temp.GeänderAm is not null AND cast(Temp.GeänderAm as Date) <> cast(Temp.Datum as Date))", "") & + ' "order by Temp.Datum, Temp.Uhrzeit " @@ -263,17 +264,17 @@ Public Class frmGesamtsicherheitenNEU [gs_gsnr] In ( SELECT [gs_gsnr] FROM tblGesamtsicherheit - WHERE gs_standort = '" & standort & "'AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' ) + WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' ) and isnull(gs_sicherheitsbetrag,0) <> 0 and gs_datum is not null UNION Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] Where gsp_gsnr In ( - SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "' + SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' ) and isnull(gsp_sicherheitsbetrag,0) <> 0 - and gsp_datum is not null + and gsp_datum is not null AND cast(gsp_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gsp_datum as Date) <= '" & datumBis.ToShortDateString & "' ) as Temp order by Temp.Datum, Temp.Uhrzeit " dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new, "AVISO", 100, True) @@ -317,8 +318,79 @@ Public Class frmGesamtsicherheitenNEU dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count) + If ausfVonBisEingeschraenkt Then + + Dim indexOffirstEntry As Integer = -1 + Dim indexOflastEntry As Integer = -1 + Dim startSaldo As Double = -1 + Dim endSaldo As Double = -1 + If ausfVonBisEingeschraenkt Then + For Each r As DataRow In dtSicherheiten.Rows + If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then + If indexOffirstEntry < 0 Then + indexOffirstEntry = dtSicherheiten.Rows.IndexOf(r) + startSaldo = r.Item("Saldo") - r.Item("Sicherheitbetrag_Calc") + End If + End If + + If CInt(r.Item("Nr")) <> 0 AndAlso Not IsDBNull(r.Item("Datum")) AndAlso IsDate(r.Item("Datum")) AndAlso CDate(r.Item("Datum")) >= datumVon Then + + If CDate(r.Item("Datum")) > datumBis Then + + If indexOflastEntry < 0 Then + indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) - 1 + endSaldo = r.Item("Saldo") + (r.Item("Sicherheitbetrag_Calc") * -1) + End If + Else + + + indexOflastEntry = dtSicherheiten.Rows.IndexOf(r) + endSaldo = r.Item("Saldo") + + End If + + + End If + Next + End If + + Dim sicherheiten_cleared As DataTable = dtSicherheiten.Clone() + Dim counter As Integer = 1 + + For Each row_insert As DataRow In dtSicherheiten.Rows + Dim idx As Integer = dtSicherheiten.Rows.IndexOf(row_insert) + + If idx >= indexOffirstEntry AndAlso idx <= indexOflastEntry Then + Dim newRow As DataRow = sicherheiten_cleared.NewRow() + newRow.ItemArray = row_insert.ItemArray.Clone() + sicherheiten_cleared.Rows.Add(newRow) + + counter += 1 + End If + Next + + Dim drFirst_new = sicherheiten_cleared.NewRow + drFirst_new.Item("Nr") = 0 + drFirst_new.Item("Typ") = "Uebertrag vom" + drFirst_new.Item("Datum") = CDate(datumVon).ToShortDateString + drFirst_new.Item("Saldo") = CDbl(startSaldo) + + sicherheiten_cleared.Rows.InsertAt(drFirst_new, 0) + + Dim drLast_new = sicherheiten_cleared.NewRow + + drLast_new.Item("Nr") = 0 + drLast_new.Item("Typ") = "Saldo zum" + drLast_new.Item("Datum") = CDate(datumBis).ToShortDateString + drLast_new.Item("Saldo") = CDbl(endSaldo) + + sicherheiten_cleared.Rows.InsertAt(drLast_new, sicherheiten_cleared.Rows.Count) + + If sicherheiten_cleared.Rows.Count > 2 Then SDL.cProgramFunctions.genExcelFromDT_NEW(sicherheiten_cleared) + + + End If - 'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc") Me.Cursor = Cursors.Default From 2897920ba55042517b04112edd2ea505d6b22c30 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Jan 2026 12:03:17 +0100 Subject: [PATCH 3/6] gesamtsicherheiten, etc. --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmGesamtsicherheitenNEU.vb | 22 ++++-- Aviso/frmHauptfenster.Designer.vb | 110 +++++++++++++++--------------- 3 files changed, 73 insertions(+), 63 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5b157f0..df13140 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index c5a7c10..97e3a93 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -274,10 +274,20 @@ Public Class frmGesamtsicherheitenNEU SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' ) and isnull(gsp_sicherheitsbetrag,0) <> 0 - and gsp_datum is not null AND cast(gsp_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gsp_datum as Date) <= '" & datumBis.ToShortDateString & "' + and gsp_datum is not null AND cast(gsp_datum as Date) <= '" & datumBis.ToShortDateString & "' ) as Temp order by Temp.Datum, Temp.Uhrzeit " - dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new, "AVISO", 100, True) + + Dim SQLStringSicherheit_new_new As String = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "', gs_MRNNr as MRN,'Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' " & IIf(detailinfo, ", [gs_erstellungsdatum] as Erstellungsdatum, [gs_zuletztgeandert] as GeänderAm, [gs_systemuser] as Benutzer ", "") & " + From [tblGesamtsicherheit] + Where gs_standort = '" & standort & "' AND cast(gs_datum as Date) > '" & datumVon.ToShortDateString & "' AND cast(gs_datum as Date) <= '" & datumBis.ToShortDateString & "' and gs_datum is not null + UNION + Select gsp_gsnr, [gsp_ATCNr],gsp_MRNNr,'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],'',[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") & " From [tblGesamtsicherheitsPositionen] + Where gsp_gsnr In ( SELECT [gs_gsnr] FROM tblGesamtsicherheit WHERE gs_standort = '" & standort & "' ) + and gsp_datum is not null AND cast(gsp_datum as Date) >= '" & datumVon.ToShortDateString & "' + ) as Temp order by Temp.Datum, Temp.Uhrzeit " + + dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit_new_new, "AVISO", 100, True) dtSicherheiten.Columns.Add("Saldo") @@ -415,14 +425,14 @@ Public Class frmGesamtsicherheitenNEU Next - Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', - [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext" & + Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', gs_MRNNr as MRN, CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', gs_art, + [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext, gsp_art" & IIf(detailinfo, ", gs_erstellungsdatum as 'Eingang erstellt am', gs_systemuser as 'von', gs_zuletztgeandert as ' Eingang geändert am', gsp_erstellungsdatum as 'Ausgang erstellt am', gsp_systemuser as 'von_', gsp_zuletztgeandert as ' Ausgang geändert am'", "") & "from [tblGesamtsicherheit] left join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId where [gs_gsnr] IN (" & gsnr & ") AND cast(gs_datum as Date) between '" & datumVon.ToShortDateString & "' and '" & datumBis.ToShortDateString & "'" & IIf(nurErstellungisNichtAenderungsdatum, " AND ( (cast(gs_datum as Date) <> cast(gs_erstellungsdatum as Date) OR gs_zuletztgeandert is not null and cast(gs_datum as Date) <> cast(gs_zuletztgeandert as Date)) - OR gsp_zuletztgeandert is not null and cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_gsId" + OR gsp_zuletztgeandert is not null and cast(gsp_datum as Date) <> cast(gsp_zuletztgeandert as Date)) ", " ") & "order by gs_datum, gsp_datum" @@ -859,7 +869,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_sicherheitsbetrag = 0 .gsp_freitext = "" .gsp_filialenNr = OPEN.gs_filialenNr - .gsp_art = "OPEN" + .gsp_art = "CLOSE" .gsp_abfertigungsNr = OPEN.gs_abfertigungsnr .gsp_erstellungsdatum = DateTime.Now .gsp_ust = "" diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index eb563f5..2d812d7 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -292,15 +292,17 @@ Partial Class frmHauptfenster Me.lblHinweis = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.pnlLinksOben = New System.Windows.Forms.Panel() + Me.Button9 = New System.Windows.Forms.Button() + Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.Label22 = New System.Windows.Forms.Label() Me.btnE_Aviso = New System.Windows.Forms.Button() Me.btnNeu = New System.Windows.Forms.Button() - Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.Button7 = New System.Windows.Forms.Button() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() Me.pic = New System.Windows.Forms.PictureBox() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() + Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -413,12 +415,10 @@ Partial Class frmHauptfenster Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlLeft = New System.Windows.Forms.Panel() + Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen() Me.Panel5 = New System.Windows.Forms.Panel() Me.Panel7 = New System.Windows.Forms.Panel() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() - Me.Button9 = New System.Windows.Forms.Button() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() - Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -2481,6 +2481,36 @@ Partial Class frmHauptfenster Me.pnlLinksOben.Size = New System.Drawing.Size(164, 91) Me.pnlLinksOben.TabIndex = 1 ' + 'Button9 + ' + Me.Button9.ContextMenuStrip = Me.cntxtAtilla + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button9.ForeColor = System.Drawing.Color.Black + Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image) + Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button9.Location = New System.Drawing.Point(127, 4) + Me.Button9.MaximumSize = New System.Drawing.Size(121, 34) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(40, 34) + Me.Button9.TabIndex = 12 + Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button9.UseVisualStyleBackColor = True + Me.Button9.Visible = False + ' + 'cntxtAtilla + ' + Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17}) + Me.cntxtAtilla.Name = "cntxt" + Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26) + ' + 'ToolStripMenuItem17 + ' + Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" + Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22) + Me.ToolStripMenuItem17.Text = "ATILLA" + ' 'Label22 ' Me.Label22.BackColor = System.Drawing.Color.Red @@ -2527,19 +2557,6 @@ Partial Class frmHauptfenster Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnNeu.UseVisualStyleBackColor = True ' - 'cntxtAtilla - ' - Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17}) - Me.cntxtAtilla.Name = "cntxt" - Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26) - ' - 'ToolStripMenuItem17 - ' - Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" - Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22) - Me.ToolStripMenuItem17.Text = "ATILLA" - ' 'Button7 ' Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2598,6 +2615,15 @@ Partial Class frmHauptfenster Me.SplitContainer3.SplitterDistance = 99 Me.SplitContainer3.TabIndex = 3 ' + 'UsrCntlBenachrichtigungen1 + ' + Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300) + Me.UsrCntlBenachrichtigungen1.TabIndex = 0 + ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -3763,7 +3789,7 @@ Partial Class frmHauptfenster Me.btnKasse_User.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnKasse_User.ForeColor = System.Drawing.Color.Black Me.btnKasse_User.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKasse_User.Location = New System.Drawing.Point(2, 32) + Me.btnKasse_User.Location = New System.Drawing.Point(2, -1) Me.btnKasse_User.Name = "btnKasse_User" Me.btnKasse_User.Size = New System.Drawing.Size(109, 34) Me.btnKasse_User.TabIndex = 4 @@ -3777,7 +3803,7 @@ Partial Class frmHauptfenster Me.btnKasse_LG.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnKasse_LG.ForeColor = System.Drawing.Color.Black Me.btnKasse_LG.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKasse_LG.Location = New System.Drawing.Point(2, -1) + Me.btnKasse_LG.Location = New System.Drawing.Point(2, 31) Me.btnKasse_LG.Name = "btnKasse_LG" Me.btnKasse_LG.Size = New System.Drawing.Size(109, 34) Me.btnKasse_LG.TabIndex = 3 @@ -3954,6 +3980,15 @@ Partial Class frmHauptfenster Me.pnlLeft.TabIndex = 88 Me.pnlLeft.Visible = False ' + 'UsrCntlBenachrichtigungen2 + ' + Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51) + Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2" + Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243) + Me.UsrCntlBenachrichtigungen2.TabIndex = 1 + ' 'Panel5 ' Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom @@ -3982,41 +4017,6 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' - 'Button9 - ' - Me.Button9.ContextMenuStrip = Me.cntxtAtilla - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button9.ForeColor = System.Drawing.Color.Black - Me.Button9.Image = CType(resources.GetObject("Button9.Image"), System.Drawing.Image) - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.Location = New System.Drawing.Point(127, 4) - Me.Button9.MaximumSize = New System.Drawing.Size(121, 34) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(40, 34) - Me.Button9.TabIndex = 12 - Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.UseVisualStyleBackColor = True - Me.Button9.Visible = False - ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300) - Me.UsrCntlBenachrichtigungen1.TabIndex = 0 - ' - 'UsrCntlBenachrichtigungen2 - ' - Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51) - Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2" - Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243) - Me.UsrCntlBenachrichtigungen2.TabIndex = 1 - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) From d69398eba3daed0fee7ce684c9cb2220f2e79882 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 29 Jan 2026 13:25:37 +0100 Subject: [PATCH 4/6] version --- Aviso/My Project/Application.myapp | 3 ++- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmHauptfenster.vb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Aviso/My Project/Application.myapp b/Aviso/My Project/Application.myapp index 318b49c..a80235e 100644 --- a/Aviso/My Project/Application.myapp +++ b/Aviso/My Project/Application.myapp @@ -6,6 +6,7 @@ 1 true 0 + 0 true - false + 0 \ No newline at end of file diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index df13140..51ac5a4 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 8efb534..7373226 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4159,7 +4159,7 @@ ELSE_ATILLA: For Each frm As Form In openForms ' Prüfe, ob das Fenster nicht das aktuelle Fenster If frm.GetType.ToString <> "AVISO.frmHauptfenster" And frm.GetType.ToString <> "AVISO.frmLogin" Then - ' Schließe das Fenster, unabhängig davon, ob es modal oder nicht ist + ' Schließe das Fenster, unabhängig davon, ob es modal oder nicht istFaviso frm.Close() End If Next From 2dd9b6fc37c1cc598f2b48a38302e74fa35a959a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 29 Jan 2026 15:41:22 +0100 Subject: [PATCH 5/6] version --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 51ac5a4..722c60b 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 0f7f242839dde26744d44bf3067ebd6c05fa27b4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 30 Jan 2026 13:41:36 +0100 Subject: [PATCH 6/6] MERIS Benachrichtigung, etc. --- Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb | 1 + Aviso/My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb index 657996e..7b8ddce 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb @@ -331,6 +331,7 @@ Public Class frmAvisoWeiterleiten End If ElseIf sender Is Button2 Then addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG") + addBtn(flpFirma, "W", "WO_MERIS", "MERIS", True, "VERAG") End If diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 722c60b..9f28567 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +