From f12c20c80042c818ca9ba75357b3f9c5d63b970e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 10 Oct 2024 11:31:28 +0200 Subject: [PATCH] Gesamtsicherheiten, Sendungsdetails (Ausdruck Anhang Rechnung) --- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 2 +- Aviso/frmGesamtsicherheitenMenuNEU.vb | 191 +++++++++++++----- Aviso/frmGesamtsicherheitenNEU.vb | 34 ++-- Aviso/frmSendungsdetailsNEU.vb | 7 +- 4 files changed, 172 insertions(+), 62 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 71a770f..25a7ad7 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -498,7 +498,7 @@ Partial Class frmGesamtsicherheitenMenuNEU 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(249, 24) + 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 diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 74f5d10..4a90f66 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -54,7 +54,7 @@ Public Class frmGesamtsicherheitenMenuNEU btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year - If GesSichRef.brgakto_gs_ATR = True Then + If GesSichRef.brgakto_gs_ATR Then Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs() If anzahlOffenerGSUeber85Tage > 0 Then btnOpenOver85Days.Visible = True @@ -67,36 +67,95 @@ Public Class frmGesamtsicherheitenMenuNEU Public Function LoadDGV() Dim sqladdon As String = "" - If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'" - If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'" + Dim sqlSicherheitssaldo As String = "" + If chkOffen.Checked Then sqlSicherheitssaldo &= " HAVING + ( COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0) + ) <> 0 " + If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'" - Dim sqlstring As String = - " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId, - max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT( - (Select SUM( Case - when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) - when gs_art = 'Close' then gs_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr - ) - + - (Select SUM( Case - when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) - when gsp_art = 'Close' then gsp_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr - ) , 'C', 'de-DE') as gs_SicherheitsSaldo + 'Dim sqlstring As String = + ' " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId, + ' max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT( + ' (Select SUM( Case + 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + 'when gs_art = 'Close' then gs_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ' ) + ' + + ' (Select SUM( Case + 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + 'when gsp_art = 'Close' then gsp_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ' ) , 'C', 'de-DE') as gs_SicherheitsSaldo - From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where - gs_freitext like '%" & txtSuchbegriff.Text & "%' OR - gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR - gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR - gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR - gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR - gs_warenort like '%" & txtSuchbegriff.Text & "%' - ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2 - Where gs_standort = '" & Standort & "' " & sqladdon & " - AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "' - AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr" + ' From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where + ' gs_freitext like '%" & txtSuchbegriff.Text & "%' OR + ' gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR + ' gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR + ' gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR + ' gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR + ' gs_warenort like '%" & txtSuchbegriff.Text & "%' + ' ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2 + ' Where gs_standort = '" & Standort & "' " & sqladdon & " + ' AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "' + ' AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr" + + + + Dim sqlstring As String = "WITH SicherheitsSaldo AS ( + SELECT + gs_gsnr, + SUM(CASE + WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag + WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag + END) AS gs_SicherheitsSaldo + FROM tblGesamtsicherheit + GROUP BY gs_gsnr + ), + PositionenSaldo AS ( + SELECT + gsp_gsnr, + SUM(CASE + WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag + WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag + END) AS gsp_SicherheitsSaldo + FROM tblGesamtsicherheitsPositionen + GROUP BY gsp_gsnr + ) + SELECT + gs.gs_gsnr, + MIN(gs.gs_standort) AS gs_standort, + MIN(gs.gs_warenort) AS gs_warenort, + MIN(gs.gs_filialenNr) AS gs_filialenNr, + MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr, + MIN(gs.gs_avisoId) AS gs_avisoId, + MAX(gs.gs_LKWKZ) AS gs_LKWKZ, + MIN(gs.gs_datum) AS gs_datum, + ( + COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0) + ) AS gs_SicherheitsSaldo + FROM + tblGesamtsicherheit gs + LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr + LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr + WHERE + gs.gs_standort = '" & Standort & "' " & sqladdon & " + AND gs.gs_datum BETWEEN '" & Date.Parse(txtDatVon.Text) & "' AND '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' + AND ( + gs.gs_freitext LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_avisoId LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_ATBNr LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_warenort LIKE '%" & txtSuchbegriff.Text & "%' + ) + GROUP BY + gs.gs_gsnr " & sqlSicherheitssaldo & + "ORDER BY + gs.gs_gsnr;" dgvListe.SET_SQL(sqlstring, "AVISO") dgvListe.LOAD() @@ -115,6 +174,7 @@ Public Class frmGesamtsicherheitenMenuNEU .Columns("gs_datum").HeaderText = "Datum" .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("gs_SicherheitsSaldo").HeaderText = "offener S-Betrag" + .Columns("gs_SicherheitsSaldo").DefaultCellStyle.Format = "c2" .Columns("gs_Warenort").Width = 96 .Columns("gs_Warenort").HeaderText = "Warenort" .Columns("gs_avisoId").Width = 96 @@ -123,8 +183,6 @@ Public Class frmGesamtsicherheitenMenuNEU End With - - If dgvListe.Rows.Count = 0 Then Exit Function dataTable = New DataTable() @@ -361,21 +419,63 @@ Public Class frmGesamtsicherheitenMenuNEU Dim anzahlOffenerGSUeber85Tage As Integer - Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, - (Select SUM( Case - when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) - when gs_art = 'Close' then gs_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr - ) - + - (Select SUM( Case - when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) - when gsp_art = 'Close' then gsp_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr - ) as Sicherheitssaldo + ' Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, + ' (Select SUM( Case + 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + 'when gs_art = 'Close' then gs_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ' ) + ' + + ' (Select SUM( Case + 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + 'when gsp_art = 'Close' then gsp_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ' ) as Sicherheitssaldo + + ' From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2 + ' Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'" + + + + Dim sqlstring As String = "WITH SicherheitsSaldo AS ( + SELECT + gs_gsnr, + SUM(CASE + WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag + WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag + END) AS gs_SicherheitsSaldo + FROM tblGesamtsicherheit + GROUP BY gs_gsnr + ), + PositionenSaldo AS ( + SELECT + gsp_gsnr, + SUM(CASE + WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag + WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag + END) AS gsp_SicherheitsSaldo + FROM tblGesamtsicherheitsPositionen + GROUP BY gsp_gsnr + ) + SELECT + COUNT(*) AS anzahlOffeneATBs + FROM ( + SELECT + gs.gs_gsnr, + MIN(gs.gs_standort) AS gs_standort, + MIN(gs.gs_datum) AS gs_datum, + COALESCE(SUM(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(SUM(PositionenSaldo.gsp_SicherheitsSaldo), 0) AS Sicherheitssaldo + FROM tblGesamtsicherheit gs + LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr + LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr + WHERE gs.gs_standort = '" & Standort & "' + AND gs.gs_datum < '" & Date.Now().AddDays(-85) & "' + GROUP BY gs.gs_gsnr + ) AS meh2 + WHERE meh2.Sicherheitssaldo <> 0;" + - From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2 - Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'" Dim dtNew As DataTable = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True) @@ -412,13 +512,10 @@ Public Class frmGesamtsicherheitenMenuNEU Next Dim frm As New frmGesamtsicherheitenNEU - Dim datumVon As Date = CDate(txtDatVon.Text) - datumVon = datumVon.AddDays(-1) If sender.ToString = "Detailliste" Then - frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text) ElseIf sender.ToString = "Referenzliste-Zollamt" Then frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort) diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index ef80ab7..5dbc325 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -75,7 +75,7 @@ Public Class frmGesamtsicherheitenNEU panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) - cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) + cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND [wo_firma] = " & firmaId & " AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) If datum = Nothing Then datum = Date.Now nextGessicherheitID = -1 @@ -114,15 +114,15 @@ Public Class frmGesamtsicherheitenNEU txtGestellInfo.Text = "" Dim sqladd1 As String = "" - If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust" + If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", (([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100) as gs_ust" If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]" Dim sqlSearchSting As String = "" If withFilterParam = True Then - If txtSuche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" + If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0" End If - Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" + Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() @@ -153,6 +153,7 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_atr").Width = 35 .Columns("gs_ust").Width = 70 .Columns("gs_ust").HeaderText = "Ust" + .Columns("gs_ust").DefaultCellStyle.Format = "c2" Case Else @@ -220,13 +221,6 @@ Public Class frmGesamtsicherheitenNEU Next - 'Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB 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', - ' [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 - ' from [tblGesamtsicherheit] - ' inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId - ' where [gs_gsnr] IN (" & gsnr & ") - ' order by gs_gsId" - Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB 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' From [tblGesamtsicherheit] @@ -725,6 +719,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ust = "" .gsp_avisoId = Me.avisoID .gsp_gsNr = OPEN.gs_gsNr + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With @@ -791,6 +786,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ust = currentSicherheit.gs_ust .gsp_ATCNr = txtPositionenCRN.Text .gsp_avisoId = Me.avisoID + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With SicherheitsPos.SAVE() @@ -990,6 +986,8 @@ Public Class frmGesamtsicherheitenNEU End With If checkSicherheitsbetrag() = False Then Exit Sub + currentSicherheit.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + currentSicherheit.gs_zuletztgeandert = Now() currentSicherheit.SAVE() txtAnzahlPos.Enabled = True btnUpdateSicherheit.Visible = False @@ -1002,7 +1000,10 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click - If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub + If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then + + Exit Sub + End If With currentSPos @@ -1016,11 +1017,17 @@ Public Class frmGesamtsicherheitenNEU currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text) Else currentSPos.gsp_datum = Nothing + If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then + MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!") + Exit Sub + End If End If End With If checkSicherheitsbetrag() = False Then Exit Sub + currentSPos.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + currentSPos.gsp_zuletztgeandert = Now() currentSPos.SAVE() btnAddPos.Visible = True btnUpdatePos.Visible = False @@ -1123,6 +1130,8 @@ Public Class frmGesamtsicherheitenNEU sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer sicherheiten.gs_LKWKZ = gessich.LKWKZ sicherheiten.gs_warenort = gessich.warenortID + sicherheiten.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + End Sub @@ -1886,6 +1895,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID .gsp_isPosRundungsdiff = True .gsp_avisoId = Me.avisoID + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With SicherheitsPos.SAVE() diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 20d1e8f..768cea8 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5399,13 +5399,15 @@ Public Class frmSendungsdetailsNEU VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, SENDUNG.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge Dim invoicePrinted As Boolean = False - If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.Contains("RECHNUNG")) Then invoicePrinted = True + If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.ToUpper.Contains("RECHNUNG")) Then invoicePrinted = True For Each l In ANH_LIST_SND Select Case l.anh_Art.ToString.ToUpper Case "RECHNUNG", "HANDELSRECHNUNG" VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) - Case "EFATURA", "EUR1" + Case "EFATURA" If Not invoicePrinted Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) + Case "EUR1" + VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) End Select Next @@ -7099,6 +7101,7 @@ Public Class frmSendungsdetailsNEU Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + isFailureShown = True End Try End Sub