Änderungen

This commit is contained in:
ja
2022-01-31 15:21:47 +01:00
parent 9de9d5b410
commit b83eea65a8
6 changed files with 2826 additions and 2725 deletions

View File

@@ -568,7 +568,7 @@ Partial Class LKWS
End Class
<WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltable2(Kennzeichen As String) As FormattedList
Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList
Dim list As List(Of String) = New List(Of String)
Dim strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
@@ -588,13 +588,21 @@ Partial Class LKWS
If IsNothing(l2.KartenNr) = False Then
strtempKartenNr = l2.KartenNr.ToString
End If
Dim Entrytemp As New List(Of String)
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis)
Entrytemp.Add(strtempKartenNr)
Entrytemp.Add(l2.KfzKennzeichen)
container.Add(Entrytemp)
If SDLNr = l2.SDLNr.ToString AndAlso Kennzeichen = l2.KfzKennzeichen.ToString AndAlso Kundennr = l2.KundenNr.ToString AndAlso History = l2.History.ToString Then
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis)
Entrytemp.Add(strtempKartenNr)
Entrytemp.Add(l2.KfzKennzeichen)
Entrytemp.Add(l2.KundenNr.ToString)
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(l2.History.ToString)
container.Add(Entrytemp)
End If
Next
HttpContext.Current.Response.ContentType = "application/json"
@@ -603,10 +611,11 @@ Partial Class LKWS
<WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltable2_M(Kennzeichen As String) As FormattedList
Public Shared Function filltable2_M(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList
Dim list As List(Of String) = New List(Of String)
Dim strtemp As String = Kennzeichen.Remove(0, 1)
Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr)
Dim container As New List(Of List(Of String))
For Each l2 In list2
@@ -623,13 +632,21 @@ Partial Class LKWS
If IsNothing(l2.KartenNr) = False Then
strtempKartenNr = l2.KartenNr.ToString
End If
Dim Entrytemp As New List(Of String)
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis)
Entrytemp.Add(strtempKartenNr)
Entrytemp.Add(l2.KfzKennzeichen)
container.Add(Entrytemp)
If String.Equals(SDLNr, l2.SDLNr.ToString) = True AndAlso String.Equals(Kennzeichen, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(Kundennr, l2.KundenNr.ToString) = True AndAlso String.Equals(History, l2.History.ToString) = True Then
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(strtempKat)
Entrytemp.Add(strtempGueltigBis)
Entrytemp.Add(strtempKartenNr)
Entrytemp.Add(l2.KfzKennzeichen)
Entrytemp.Add(l2.KundenNr.ToString)
Entrytemp.Add(l2.SDLNr.ToString)
Entrytemp.Add(l2.History.ToString)
container.Add(Entrytemp)
End If
Next
HttpContext.Current.Response.ContentType = "application/json"