This commit is contained in:
2020-06-22 13:32:11 +02:00
parent 8f6eaaaba8
commit 0a7e4feedd
8 changed files with 156 additions and 52 deletions

View File

@@ -927,6 +927,7 @@ Public Class frmSendungAnhangImport
' VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Sendungs-Anhänge
'End If
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(ANH_LIST, AvisoId) 'LÄDT alle Aviso-Anhänge
If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.Clear()
If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.Clear()
lblWarenbeichnung.Text = ""
@@ -942,27 +943,37 @@ Public Class frmSendungAnhangImport
lblEmpfaenger.Text = If(SND.tblSnd_Empfaenger, "")
End If
Dim SndNr = cboSendungen._value
Dim ListToAdd_flpnlSendungen As New List(Of usrCntlSendungAnhangElement)
Dim ListToAdd_flpnlAviso As New List(Of usrCntlSendungAnhangElement)
For Each a In ANH_LIST
If If(a.anh_SendungsId, 0) > 0 Then
If cboSendungen._value <> "" AndAlso cboSendungen._value = a.anh_SendungsId Then
If SndNr <> "" AndAlso SndNr = a.anh_SendungsId Then
If pnl Is Nothing OrElse pnl Is flpnlSendungen Then
addtoPnl(a, flpnlSendungen, keepActive, aktiveId)
ListToAdd_flpnlSendungen.Add(addtoPnl(a, flpnlSendungen, keepActive, aktiveId, True))
End If
End If
Else
If pnl Is Nothing OrElse pnl Is flpnlAviso Then
addtoPnl(a, flpnlAviso, keepActive, aktiveId)
ListToAdd_flpnlAviso.Add(addtoPnl(a, flpnlAviso, keepActive, aktiveId, True))
End If
End If
Next
If pnl Is Nothing OrElse pnl Is flpnlSendungen Then flpnlSendungen.Controls.AddRange(ListToAdd_flpnlSendungen.ToArray)
If pnl Is Nothing OrElse pnl Is flpnlAviso Then flpnlAviso.Controls.AddRange(ListToAdd_flpnlAviso.ToArray)
'If act Is Nothing Then initLocationViewer("", "PDF")
End Sub
Sub addtoPnl(a As VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge, pnl As FlowLayoutPanel, keepActive As Boolean, aktiveId As Integer)
Function addtoPnl(a As VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge, pnl As FlowLayoutPanel, keepActive As Boolean, aktiveId As Integer, Optional ByVal returnElement As Boolean = False) As usrCntlSendungAnhangElement
Dim USRCNTL As New usrCntlSendungAnhangElement
USRCNTL.FILE_PATH = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(a.anh_docId)
USRCNTL.FILE_PATH = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID_onlyPATH(a.anh_docId)
'USRCNTL.FILE_PATH = SQL.getValueTxtBySql("SELECT TOP (1) [coll_pfad] FROM [tblDatenarchiv_Collection] where coll_daId=" & a.anh_docId & " ORDER BY coll_date DESC", "FMZOLL")
USRCNTL.FILE_NAME = a.anh_Name
USRCNTL.FILE_TYPE = a.anh_Typ
@@ -975,8 +986,12 @@ Public Class frmSendungAnhangImport
End If
End If
initElement(USRCNTL)
pnl.Controls.Add(USRCNTL)
End Sub
If Not returnElement Then
pnl.Controls.Add(USRCNTL)
End If
Return USRCNTL
End Function
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnAnfuegenAll.Click
clearPnlAnfuegen()