This commit is contained in:
2024-08-30 16:56:47 +02:00
parent ba4e76d3e2
commit 3f1bca12c0
4 changed files with 230 additions and 175 deletions

View File

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

View File

@@ -6601,6 +6601,9 @@ Public Class AvisoStatusFunctions
Public Function openSnd(sendId, AvisoID) As Form Public Function openSnd(sendId, AvisoID) As Form
Try
If sendId Is Nothing Then Return Nothing If sendId Is Nothing Then Return Nothing
If AvisoID Is Nothing Then Return Nothing If AvisoID Is Nothing Then Return Nothing
If sendId <= 0 Then Return Nothing If sendId <= 0 Then Return Nothing
@@ -6622,6 +6625,11 @@ Public Class AvisoStatusFunctions
frmSendungsdetails.Show() 'Dialog() ' frmSendungsdetails.ShowDialog(frmGrayOut) frmSendungsdetails.Show() 'Dialog() ' frmSendungsdetails.ShowDialog(frmGrayOut)
' frmGrayOut.Close() ' frmGrayOut.Close()
Return frmSendungsdetails Return frmSendungsdetails
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Function End Function

View File

@@ -38,7 +38,7 @@ Public Class frmSendungsdetailsNEU
Dim usrcntl_ATB As usrCntlSND_ATBGestellung Dim usrcntl_ATB As usrCntlSND_ATBGestellung
Dim usrcntl_AUSFUHR As usrCntlSND_Ausfuhr Dim usrcntl_AUSFUHR As usrCntlSND_Ausfuhr
Dim listOfTextconserven Dim listOfTextconserven
Dim isFailureShown As Boolean = False
Dim cntVeranlagungsRg = 0 Dim cntVeranlagungsRg = 0
Sub New() Sub New()
@@ -50,6 +50,9 @@ Public Class frmSendungsdetailsNEU
End Sub End Sub
Sub New(AvisoId, SendungID) Sub New(AvisoId, SendungID)
Try
InitializeComponent() InitializeComponent()
Me.AvisoId = AvisoId Me.AvisoId = AvisoId
Me.SendungID = SendungID Me.SendungID = SendungID
@@ -57,6 +60,10 @@ Public Class frmSendungsdetailsNEU
SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True) SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True)
UpdateStyles() UpdateStyles()
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
Private Sub frmSendungsdetails_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Private Sub frmSendungsdetails_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -92,6 +99,8 @@ Public Class frmSendungsdetailsNEU
cntlEmpfaenger_Sonst.special(False) cntlEmpfaenger_Sonst.special(False)
cntlAuftraggeber_Sonst.special(False) cntlAuftraggeber_Sonst.special(False)
cntlFrachtfuehrer_Sonst.special(False) cntlFrachtfuehrer_Sonst.special(False)
Try
For Each c In Panel6.Controls For Each c In Panel6.Controls
If c.GetType.ToString = "AVISO.usrcntlCheckBox" Then If c.GetType.ToString = "AVISO.usrcntlCheckBox" Then
@@ -109,6 +118,11 @@ Public Class frmSendungsdetailsNEU
End If End If
Next Next
SENDUNG_LIST(CURRENT_INDEX).SAVE_Abrechnung() SENDUNG_LIST(CURRENT_INDEX).SAVE_Abrechnung()
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
Function SAVE_ME(Optional saveAll = False, Optional isDublicated = False) As Boolean Function SAVE_ME(Optional saveAll = False, Optional isDublicated = False) As Boolean
@@ -150,7 +164,9 @@ Public Class frmSendungsdetailsNEU
Sub doVeranlagungsValidation() Sub doVeranlagungsValidation()
cntVeranlagungsRg = SQL.DLookup("count(*)", "tblAvisoAnhaenge", "anh_SendungsId='" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & "' AND anh_art='VERANLANGUNG_RG' ", "AVISO", "0") cntVeranlagungsRg = SQL.DLookup("count(*)", "tblAvisoAnhaenge", "anh_SendungsId='" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & "' AND anh_art='VERANLANGUNG_RG' ", "AVISO", "0")
End Sub End Sub
Function VALIDATE_ME(Optional showErr = True) As Boolean Function VALIDATE_ME(Optional showErr As Boolean = True) As Boolean
Try
pnlValidation.Visible = False pnlValidation.Visible = False
rtbValidierung.Text = "" rtbValidierung.Text = ""
@@ -259,6 +275,12 @@ Public Class frmSendungsdetailsNEU
' pnlValidation.Visible = rtbValidierung.Text <> "" ' pnlValidation.Visible = rtbValidierung.Text <> ""
Return True Return True
Catch ex As Exception
Dim err = "interner Anzeigefehler"
rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
isFailureShown = True
End Try
End Function End Function
Sub NEXT_SENDUNG() Sub NEXT_SENDUNG()
@@ -268,6 +290,7 @@ Public Class frmSendungsdetailsNEU
initDataBinding() initDataBinding()
' initButtons() ' initButtons()
End If End If
End Sub End Sub
Sub PREV_SENDUNG() Sub PREV_SENDUNG()
@@ -3796,6 +3819,7 @@ Public Class frmSendungsdetailsNEU
End Sub End Sub
Private Sub Button15_Click(sender As Object, e As EventArgs) Handles btnVorauszahlung.Click Private Sub Button15_Click(sender As Object, e As EventArgs) Handles btnVorauszahlung.Click
SAVE_ME() ' falls Änderungen gemacht in Sendung wurden!
FormularArt = SDL.FormularManagerArten.Importaviso_VK FormularArt = SDL.FormularManagerArten.Importaviso_VK
cntxtVorauskasse.Show(Cursor.Position) cntxtVorauskasse.Show(Cursor.Position)
End Sub End Sub
@@ -6843,6 +6867,7 @@ Public Class frmSendungsdetailsNEU
Private Sub mnuItem_MouseHover(sender As Object, e As EventArgs) Private Sub mnuItem_MouseHover(sender As Object, e As EventArgs)
Try
'ContextMenuStrip1.Hide() 'ContextMenuStrip1.Hide()
Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
@@ -6868,6 +6893,9 @@ Public Class frmSendungsdetailsNEU
End If End If
End If End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
@@ -7034,6 +7062,8 @@ Public Class frmSendungsdetailsNEU
Private Sub loadContextMenudynMailvorlagen() Private Sub loadContextMenudynMailvorlagen()
Try
Dim Sprachen = New cTextkonserve_LIST(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) Dim Sprachen = New cTextkonserve_LIST(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
@@ -7051,11 +7081,21 @@ Public Class frmSendungsdetailsNEU
Next Next
'ContextMenuStrip1.Show(Cursor.Position) 'ContextMenuStrip1.Show(Cursor.Position)
End If End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
Private Sub timerValidation_Tick(sender As Object, e As EventArgs) Handles timerValidation.Tick Private Sub timerValidation_Tick(sender As Object, e As EventArgs) Handles timerValidation.Tick
VALIDATE_ME(False) Try
VALIDATE_ME(False) 'verhindert eine Fehlerendlosschleife!
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
Private Sub Button23_Click_1(sender As Object, e As EventArgs) Handles Button23.Click Private Sub Button23_Click_1(sender As Object, e As EventArgs) Handles Button23.Click

View File

@@ -1860,12 +1860,18 @@ Public Class usrcntlAktDetails
End Sub End Sub
Sub openSnd(sndId) Sub openSnd(sndId)
Try
Dim f = FUNC.openSnd(sndId, AvisoID) Dim f = FUNC.openSnd(sndId, AvisoID)
If f IsNot Nothing Then If f IsNot Nothing Then
AddHandler f.FormClosed, Sub() AddHandler f.FormClosed, Sub()
initDgvSendungen() initDgvSendungen()
End Sub End Sub
End If End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub End Sub
Private Sub gridVermerke_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridVermerke.CellDoubleClick Private Sub gridVermerke_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridVermerke.CellDoubleClick
@@ -3413,6 +3419,7 @@ Public Class usrcntlAktDetails
If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index
VermerkeDAL.toggleHervorheben(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value)) VermerkeDAL.toggleHervorheben(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value))
Vermerke_anzeigen(index) Vermerke_anzeigen(index)
initDgvSendungen()
End Sub End Sub
Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnAlleSteuerbescheide.Click Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnAlleSteuerbescheide.Click