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

Timas, Gesamtsicherheiten, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-01-12 16:10:07 +01:00
parent fd0af0f843
commit f98821c15a
5 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

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

41
Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb generated
View File

@@ -22,15 +22,15 @@ Partial Class frmGesamtsicherheitenMenuNEU
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
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.components)
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip()
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.Panel1 = New System.Windows.Forms.Panel()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.Label26 = New System.Windows.Forms.Label()
Me.btnBisTag = New System.Windows.Forms.Button()
Me.btnVonTag = New System.Windows.Forms.Button()
@@ -53,9 +53,8 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.lblSaldo = New System.Windows.Forms.Label()
Me.lblZollsatz = New System.Windows.Forms.Label()
Me.lblReferenzwert = New System.Windows.Forms.Label()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -64,6 +63,7 @@ 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.ContextMenuStrip1.SuspendLayout()
Me.Panel1.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -72,9 +72,9 @@ Partial Class frmGesamtsicherheitenMenuNEU
'
'ContextMenuStrip1
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem})
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem, Me.SaldoZumStichtagToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 48)
Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 92)
'
'ExportCSVToolStripMenuItem
'
@@ -147,6 +147,17 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.Panel1.Size = New System.Drawing.Size(658, 288)
Me.Panel1.TabIndex = 0
'
'PictureBox5
'
Me.PictureBox5.BackColor = System.Drawing.Color.White
Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
Me.PictureBox5.Name = "PictureBox5"
Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
Me.PictureBox5.TabIndex = 132
Me.PictureBox5.TabStop = False
'
'Label26
'
Me.Label26.AutoSize = True
@@ -430,17 +441,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.lblReferenzwert.TabIndex = 6
Me.lblReferenzwert.Text = "Referenzwert: -"
'
'PictureBox5
'
Me.PictureBox5.BackColor = System.Drawing.Color.White
Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen
Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox5.Location = New System.Drawing.Point(3, 3)
Me.PictureBox5.Name = "PictureBox5"
Me.PictureBox5.Size = New System.Drawing.Size(23, 22)
Me.PictureBox5.TabIndex = 132
Me.PictureBox5.TabStop = False
'
'btnExcel
'
Me.btnExcel.allowBorder = False
@@ -604,6 +604,12 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.btnNeu.Text = "Neu"
Me.btnNeu.UseVisualStyleBackColor = False
'
'SaldoZumStichtagToolStripMenuItem
'
Me.SaldoZumStichtagToolStripMenuItem.Name = "SaldoZumStichtagToolStripMenuItem"
Me.SaldoZumStichtagToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
Me.SaldoZumStichtagToolStripMenuItem.Text = "Saldo zum Stichtag"
'
'frmGesamtsicherheitenMenuNEU
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -667,4 +673,5 @@ Partial Class frmGesamtsicherheitenMenuNEU
Friend WithEvents ReferenzlisteZollamtToolStripMenuItem As ToolStripMenuItem
Friend WithEvents DetaillisteToolStripMenuItem As ToolStripMenuItem
Friend WithEvents PictureBox5 As PictureBox
Friend WithEvents SaldoZumStichtagToolStripMenuItem As ToolStripMenuItem
End Class

25
Aviso/frmGesamtsicherheitenMenuNEU.vb
View File

@@ -518,20 +518,20 @@ Public Class frmGesamtsicherheitenMenuNEU
Dim detailINfo As Boolean = True
Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False
If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then
detailINfo = True
End If
'Dim nurErstellungsdatumNotAenderungsdatum As Boolean = False
'If vbYes = MsgBox("Sollen nur Datensaetze angegeben werden, deren Erstellungsdatum/Änderungsdatum vom Gestellungsdatum abweicht?", vbYesNoCancel) Then
' nurErstellungsdatumNotAenderungsdatum = True
'End If
If sender.ToString = "Detailliste" Then
frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text, detailINfo, nurErstellungsdatumNotAenderungsdatum)
frm.LoadDataTableSicherheitenForExport2(list, datumVon, CDate(txtDatBis.Text), detailINfo, nurErstellungsdatumNotAenderungsdatum)
ElseIf sender.ToString = "Referenzliste-Zollamt" Then
If Not vbYes = MsgBox("Sollen interne Detailinfos angegeben werden?", vbYesNoCancel) Then
If Not vbYes = MsgBox("Sollen interne Detailinfos mitangegeben werden?", vbYesNoCancel) Then
detailINfo = False
End If
frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum)
frm.LoadDataTableSicherheitenForExport(list, datumVon, CDate(txtDatBis.Text), Standort, detailINfo, nurErstellungsdatumNotAenderungsdatum)
Else
MsgBox("Funktion nicht definiert!")
Exit Sub
@@ -579,4 +579,15 @@ Public Class frmGesamtsicherheitenMenuNEU
Dim webAddress As String = "https://wiki.verag.ag/e/de/software/aviso/howtos/Gesamtsicherheiten"
Process.Start(webAddress)
End Sub
Private Sub SaldoZumStichtagToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaldoZumStichtagToolStripMenuItem.Click
Dim f As New frmDatumsabfrage("Saldo zum Stichtag", False)
f.ShowDialog()
If f.DialogResult = DialogResult.OK Then
GesSichRef.CalcSaldo(, f.Datum)
End If
End Sub
End Class

27
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -116,7 +116,7 @@ Public Class frmGesamtsicherheitenNEU
End If
Else
LoadDGVSicherheiten(True)
LoadDGVSicherheiten(True)
End If
LoadStandort()
cboSicherheitATR.Enabled = currentGesSichRef.brgakto_gs_ATR
@@ -221,12 +221,12 @@ Public Class frmGesamtsicherheitenNEU
End If
calcGesamtsummen()
calcGesamtsummen()
End Sub
Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As String, datumBis As String, 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
@@ -245,15 +245,15 @@ Public Class frmGesamtsicherheitenNEU
Next
Dim SQLStringSicherheit = " select * from (select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "','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 ", "") & "
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],'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],[gsp_art],[gsp_ust] " & IIf(detailinfo, ", [gsp_erstellungsdatum] as Erstellungsdatum, [gsp_zuletztgeandert] as GeänderAm, [gsp_systemuser] as Benutzer ", "") &
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_art],[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 " & IIf(nurErstellungisNichtAenderungsdatum, " WHERE (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))", "") &
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)
@@ -265,7 +265,8 @@ Public Class frmGesamtsicherheitenNEU
drFirst.Item("Nr") = 0
drFirst.Item("Typ") = "Uebertrag vom"
drFirst.Item("Datum") = CDate(datumVon).ToShortDateString
drFirst.Item("Saldo") = SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum asc", "AVISO",,, currentGesSichRef.getReferenzbetrag(CDate(datumVon).ToShortDateString)) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
Dim DefaultSaldo As Double = currentGesSichRef.getReferenzbetrag(CDate(datumVon).ToShortDateString)
drFirst.Item("Saldo") = SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum desc", "AVISO",,, DefaultSaldo) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
dtSicherheiten.Rows.InsertAt(drFirst, 0)
@@ -305,7 +306,7 @@ Public Class frmGesamtsicherheitenNEU
Public Sub LoadDataTableSicherheitenForExport2(list As List(Of Integer), datumVon As String, datumBis As String, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False)
Public Sub LoadDataTableSicherheitenForExport2(list As List(Of Integer), datumVon As Date, datumBis As Date, Optional detailinfo As Boolean = False, Optional nurErstellungisNichtAenderungsdatum As Boolean = False)
Me.Cursor = Cursors.WaitCursor
@@ -320,12 +321,12 @@ Public Class frmGesamtsicherheitenNEU
Next
Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', 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',
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" &
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]
inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
where [gs_gsnr] IN (" & gsnr & ")" & IIf(nurErstellungisNichtAenderungsdatum, " AND (
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"
@@ -352,8 +353,8 @@ Public Class frmGesamtsicherheitenNEU
saldoStart = CDbl(dtSicherheiten.Rows(0).Item("SSaldo"))
saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("SSaldo"))
sicherheitsbetragATCs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag"))
sicherheitsbetragATBs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2"))
If Not IsDBNull(dtSicherheiten.Rows(i).Item("Sicherheitbetrag")) Then sicherheitsbetragATCs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag"))
If Not IsDBNull(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2")) Then sicherheitsbetragATBs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2"))
c1 = saldo - sicherheitsbetragATCs + sicherheitsbetragATBs

11
Aviso/frmHauptfenster.vb
View File

@@ -718,7 +718,7 @@ Public Class frmHauptfenster
timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
If Not timeEntryExisting AndAlso isEndpointRunning Then
Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER)
Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen)
frm.TopMost = True
frm.ShowDialog()
@@ -727,6 +727,15 @@ Public Class frmHauptfenster
Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
f.ShowDialog()
f.TopMost = True
If f.DialogResult = DialogResult.OK AndAlso f.resultCode >= 0 Then
Dim info
timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", f.resultCode)
MsgBox(info)
Else
Exit Sub
End If
Else
Dim info
timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.typ)