This commit is contained in:
2020-11-05 07:59:47 +01:00
parent dcb3cea10e
commit 3b532b0a10
37 changed files with 2804 additions and 189 deletions

View File

@@ -1673,9 +1673,18 @@ Public Class FormularManagerNEU
Return LaufzettelZollDE(AVISO, SENDUNG_LIST)
End Function
Shared Function LaufzettelZollDE_VP(AvisoId As Integer, Optional printReportElsePDF As Boolean = False, Optional printername As String = "", Optional Vorpapier As String = "") As String
Dim AVISO = (New VERAG_PROG_ALLGEMEIN.cAvisoDAL).LesenAviso(AvisoId, "")
If AVISO Is Nothing Then Return ""
Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST_VP(SENDUNG_LIST, 0, AvisoId, Vorpapier) 'LÄDT alle SENDUNGSDATEN
If SENDUNG_LIST Is Nothing OrElse SENDUNG_LIST.Count = 0 Then Return ""
Return LaufzettelZollDE(AVISO, SENDUNG_LIST,,, Vorpapier)
End Function
Shared gesColli As Double = 0
Shared gesGewicht As Double = 0
Shared Function LaufzettelZollDE(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNGEN As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), Optional printReportElsePDF As Boolean = False, Optional printername As String = "") As String
Shared Function LaufzettelZollDE(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNGEN As List(Of VERAG_PROG_ALLGEMEIN.cSendungen), Optional printReportElsePDF As Boolean = False, Optional printername As String = "", Optional Vorpapier As String = "") As String
' Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
Dim tmpPath = ""
Try
@@ -1777,6 +1786,26 @@ Public Class FormularManagerNEU
' MsgBox(ex.Message & ex.StackTrace)
'End Try
rpt.SubReport1.Visible = False
If Vorpapier = "" Then
AVISO.LOAD_Vorpapiere()
If AVISO.VORPAPIERE.Count > 0 Then ' prüfen, ob AT-Zoll ohne Ü-T1 --> dann kein Eintrag!
' rpt.Detail.Visible = False
Dim SubRptVP As New subRptLaufzettelZollDE_Vorpapier(AVISO.VORPAPIERE)
rpt.SubReport1.Report = SubRptVP
rpt.SubReport1.Visible = True
End If
Else
Dim VORPAPIERE As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoVorpapier)
Dim VP As New VERAG_PROG_ALLGEMEIN.cAvisoVorpapier
VP.vp_Nr = Vorpapier : VORPAPIERE.Add(VP)
Dim SubRptVP As New subRptLaufzettelZollDE_Vorpapier(VORPAPIERE)
rpt.SubReport1.Report = SubRptVP
rpt.SubReport1.Visible = True
End If
'MsgBox(tb.Rows.Count)
@@ -1792,7 +1821,7 @@ Public Class FormularManagerNEU
rpt.txtNr.Text = CInt(rpt.Fields.Item("Nr").Value) + 1
rpt.txtPos.Text = If(SND.tblSnd_Vorpapier_Pos, "")
If SND.tblSnd_Fremdspedition Then
rpt.txtAbfertigungsart.Text = "FREMD"
@@ -1895,7 +1924,7 @@ Public Class FormularManagerNEU
gesColli += a.sndhdg_colli
gesGewicht += a.sndhdg_gewicht
Next
Dim SubRpt As New subRptLaufzettelZollDE_ATA(ATAMRN_List, SND.tblSnd_Fremdspedition, ZOLLANMELDUNG.Vorpapier)
Dim SubRpt As New subRptLaufzettelZollDE_ATA(ATAMRN_List, SND.tblSnd_Fremdspedition, ZOLLANMELDUNG.Vorpapier, SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung)
rpt.SubReport.Report = SubRpt
End If
@@ -1903,7 +1932,7 @@ Public Class FormularManagerNEU
rpt.txtAnmerkung.Visible = False
'If ATAMRN_List.Count = 0 Then
'If ATAMRN_List.Count = 0 Then
' rpt.txtAnmerkung.Text = ""
' Dim colliGewicht = ""
@@ -1957,8 +1986,12 @@ Public Class FormularManagerNEU
rpt.Dispose()
Else
If (Vorpapier <> "") Then
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Gestellungsliste_" & Vorpapier & ".pdf", ".pdf", , False)
Else
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("LaufzettelZollDE.pdf", ".pdf", , False)
End If
tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("LaufzettelZollDE.pdf", ".pdf", , False)
Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
rpt.Run(False)
@@ -1969,8 +2002,6 @@ Public Class FormularManagerNEU
End If
Catch ex As Exception
MessageBox.Show(ex.ToString & ex.StackTrace)
End Try