From 2897920ba55042517b04112edd2ea505d6b22c30 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Jan 2026 12:03:17 +0100 Subject: [PATCH] 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!)