diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 16f58e38..6685acfd 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb b/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb index f337b13b..3f4fec91 100644 --- a/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb +++ b/SDL/Reports/Zoll/subrptKontrolleLKW_Dakosy.vb @@ -37,9 +37,21 @@ Public Class subrptKontrolleLKW_Dakosy 'lblArbNrValue.Text = nullStr(Fields.Item("ArbNr").Value) lblMRNValue.Text = nullStr(Fields.Item("ncts_MRN").Value) '.Text = nullStr(Fields.Item("Pos").Value) - lblAnDatValue.Text = nullDat(Fields.Item("ncts_Eroeffnung").Value) + + If Fields.Item("ncts_Eroeffnung") IsNot Nothing AndAlso Fields.Item("ncts_Eroeffnung").Value IsNot DBNull.Value Then + lblAnDatValue.Text = nullDat(Fields.Item("ncts_Eroeffnung").Value) + Else + lblAnDatValue.Text = nullDat(Fields.Item("ncts_Trans_DatumZeit").Value) + End If + + + If Fields.Item("ncts_Ankunft") IsNot Nothing AndAlso Fields.Item("ncts_Ankunft").Value IsNot DBNull.Value Then + lblGestDatValue.Text = nullDat(Fields.Item("ncts_Ankunft").Value) + Else + lblGestDatValue.Text = nullDat(Fields.Item("ncts_GestelltAm").Value) + End If + ' lblAnDatValue.Text = nullDat(Fields.Item("ncts_Trans_DatumZeit").Value) - lblGestDatValue.Text = nullDat(Fields.Item("ncts_Ankunft").Value) lblSBValue.Text = nullStr(Fields.Item("ncts_Bearbeiter").Value) lblBuergschaft.Text = nullStr(Fields.Item("nctsSA_GRN").Value) If Not Fields.Item("nctsSA_AbgabenBetrag").Value Is DBNull.Value Then