Optionale Suchparameter eingebunden

Customers/CustomsAviso.aspx.vb

@@ -24,6 +24,10 @@ Partial Class Kundenbereich_Default
     Dim datevon As DateTime
     Dim datebis As DateTime
     Dim Kdnrtext As String
+    Dim Absender As String = ""
+    Dim Empfaenger As String = ""
+    Dim LKWNR As String = ""
+    Dim KDNAFNR As String = ""
     Dim dt As DataTable
 
     Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
@@ -32,10 +36,24 @@ Partial Class Kundenbereich_Default
         'MsgBox(Session.Item("PW").ToString)
         Kdnrtext = Session.Item("CustomerID").ToString
         dt = Nothing
+        If txt_Absender.Text IsNot "" Then
+            Absender = txt_Absender.Text
+        ElseIf txt_Empfaenger.Text IsNot "" Then
+            Empfaenger = txt_Empfaenger.Text
+        ElseIf txt_KdNrAuftrag.Text IsNot "" Then
+            KDNAFNR = txt_KdNrAuftrag.Text
+        ElseIf txt_LKWNr.Text IsNot "" Then
+            LKWNR = txt_LKWNr.Text
+        Else
+            Absender = ""
+            Empfaenger = ""
+            KDNAFNR = ""
+            LKWNR = ""
+        End If
 
         'Dim tr
         If rbt_Erf.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0})
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Freig.Checked = True Then
             If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
                 If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
@@ -47,20 +65,21 @@ Partial Class Kundenbereich_Default
                     End Try
                 Else
                 End If
-                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis)
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             Else
-                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
             End If
         ElseIf rbt_Ankunft.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorb.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4})
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorg.Checked = True Then
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5})
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then
             If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
                 MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-                pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+            End If
+            pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
                 pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
                 datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
                 datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
@@ -71,10 +90,10 @@ Partial Class Kundenbereich_Default
                     Catch ex As Exception
                         MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
                     End Try
-                    dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
+                    dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                 End If
-            End If
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
+
+                dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
         Else
             If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
                 Try
@@ -85,7 +104,7 @@ Partial Class Kundenbereich_Default
                 End Try
             Else
             End If
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
+            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
         End If
 
         If dt IsNot Nothing Then
@@ -133,8 +152,9 @@ Partial Class Kundenbereich_Default
                 tr.Cells.Add(tbl_CellIndex)
                 tbl_CellArt.Text = ""
                 tr.Cells.Add(tbl_CellArt)
-                tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
-                tr.Cells.Add(tbl_CellKundenNr)
+                'tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
+                ' tr.Cells.Add(tbl_CellKundenNr)
+
                 Select Case d("Status")
                     Case 1
                         tbl_CellStatus.Text = "Erfasst"
@@ -187,13 +207,8 @@ Partial Class Kundenbereich_Default
         End If
     End Sub
 
-    Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs)
-        MsgBox("Es funzt!")
-        ' datepicker1.Visible = True
-        ' datepicker2.Visible = True
-    End Sub
-
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
+
         rbt_Ankunft.Checked = False
         rbt_Ankunft.Enabled = True
         rbt_Erf.Checked = False
@@ -209,7 +224,7 @@ Partial Class Kundenbereich_Default
         pickdate2.Text = ""
         datevon = Nothing
         datebis = Nothing
-        dt = New DataTable
+        dt = Nothing
         Kdnrtext = ""
         'txt_KdNr.Focus()
     End Sub