diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 18aa148..5ee2857 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -41,24 +41,24 @@

Hier finden Sie Informationen zu den aktuellen Aufträgen.

<%Try - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW - 'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124) - Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL - ' MsgBox(VERAGSQL.GetADMINConnectionString()) - 'Response.Write(AD.Ordnungsbegriff) - Dim STANDORT = "SUB" - If (Request.QueryString.Count > 0) AndAlso (Request.QueryString("STANDORT") IsNot Nothing) Then - Try - STANDORT = (Request.QueryString("STANDORT")) - Catch ex As Exception - STANDORT = "SUB" - End Try - End If - If True Then - Dim AVISO_dt As System.Data.DataTable = VERAG_PROG_ALLGEMEIN.cAviso.getAVISO_List(STANDORT) - If AVISO_dt IsNot Nothing Then + VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW + 'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124) + Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL + ' MsgBox(VERAGSQL.GetADMINConnectionString()) + 'Response.Write(AD.Ordnungsbegriff) + Dim STANDORT = "SUB" + If (Request.QueryString.Count > 0) AndAlso (Request.QueryString("STANDORT") IsNot Nothing) Then + Try + STANDORT = (Request.QueryString("STANDORT")) + Catch ex As Exception + STANDORT = "SUB" + End Try + End If + If True Then + Dim AVISO_dt As System.Data.DataTable = VERAG_PROG_ALLGEMEIN.cAviso.getAVISO_List(STANDORT) + If AVISO_dt IsNot Nothing Then - If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%> + If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>
@@ -67,22 +67,22 @@
- +
-
- +
+
-
+
- +
@@ -105,7 +105,7 @@
- +
@@ -185,11 +185,11 @@


<% End If - End If - End If - Catch ex As Exception - Response.Write(ex.Message & ex.StackTrace) - End Try %> + End If + End If + Catch ex As Exception + Response.Write(ex.Message & ex.StackTrace) + End Try %> @@ -202,5 +202,5 @@
--%> - + \ No newline at end of file diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index ca6327f..905dbbf 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -16,8 +16,6 @@ Partial Class Kundenbereich_Default End If End Sub - - Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs) FormsAuthentication.SignOut() @@ -46,31 +44,37 @@ Partial Class Kundenbereich_Default dt = Nothing - If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then - Try - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - Catch ex As Exception - MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) - End Try - End If + 'Dim tr If rbt_Erf.Checked = True Then dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}) ElseIf rbt_Freig.Checked = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis) + If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then + If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then + Try + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) + End Try + Else + End If + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis) + Else + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("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}) - ElseIf rbt_Vorb.Checked = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}) + ElseIf rbt_Vorb.Checked = True Then + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}) - ElseIf rbt_Vorg.Checked = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}) + ElseIf rbt_Vorg.Checked = True Then + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}) - 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 + 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 @@ -78,7 +82,17 @@ Partial Class Kundenbereich_Default datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing) datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) + Else + If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then + Try + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) + End Try + Else + End If dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) End If End If @@ -165,14 +179,11 @@ Partial Class Kundenbereich_Default tr.Cells.Add(tbl_CellKundAuftNr) normaltable.Rows.Add(tr) - i += 1 Next - End If End Sub - Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs) MsgBox("Es funzt!") ' datepicker1.Visible = True @@ -197,23 +208,5 @@ Partial Class Kundenbereich_Default dt = Nothing Kdnrtext = "" 'txt_KdNr.Focus() - - - End Sub - - -End Class - - - - - - - - - - - - - +End Class \ No newline at end of file