edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-11-27 22:58:30 +01:00
parent 3b532b0a10
commit 0be9927381
62 changed files with 6974 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
View File

@@ -94,6 +94,10 @@ Public Class cSendungen
Property tblSnd_Vorpapier As Object = Nothing
Property tblSnd_Vorpapier_Pos As Object = Nothing
Property tblSnd_Vorpapier2 As Object = Nothing
Property tblSnd_Vorpapier2_Pos As Object = Nothing
Property tblSnd_Vorpapier3 As Object = Nothing
Property tblSnd_Vorpapier3_Pos As Object = Nothing
Public saveSachbearbeiter As Boolean = False
@@ -124,6 +128,18 @@ Public Class cSendungen
Shared Function VP_Enum(ByVal SENDUNG_LIST As List(Of cSendungen)) As List(Of String)
Dim list = New List(Of String)
'If SENDUNG_LIST IsNot Nothing Then
' For Each s In SENDUNG_LIST
' If If(s.tblSnd_Vorpapier, "") <> "" Then
' Dim found = False
' For Each l In list
' If l = s.tblSnd_Vorpapier Then found = True
' Next
' If found = False Then list.Add(s.tblSnd_Vorpapier)
' End If
' Next
'End If
If SENDUNG_LIST IsNot Nothing Then
For Each s In SENDUNG_LIST
If If(s.tblSnd_Vorpapier, "") <> "" Then
@@ -133,8 +149,23 @@ Public Class cSendungen
Next
If found = False Then list.Add(s.tblSnd_Vorpapier)
End If
If If(s.tblSnd_Vorpapier2, "") <> "" Then
Dim found = False
For Each l In list
If l = s.tblSnd_Vorpapier2 Then found = True
Next
If found = False Then list.Add(s.tblSnd_Vorpapier2)
End If
If If(s.tblSnd_Vorpapier3, "") <> "" Then
Dim found = False
For Each l In list
If l = s.tblSnd_Vorpapier3 Then found = True
Next
If found = False Then list.Add(s.tblSnd_Vorpapier3)
End If
Next
End If
Return list
End Function
@@ -151,7 +182,7 @@ Public Class cSendungen
If SENDUNG_LIST Is Nothing Then SENDUNG_LIST = New List(Of cSendungen)
SENDUNG_LIST.Clear()
Dim SQL As New SQL
For Each r In SQL.loadDgvBySql("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & " AND tblSnd_Vorpapier='" & Vorpapier & "' ORDER BY tblSnd_PosUnterNr,tblSnd_SendungID", "AVISO").Rows
For Each r In SQL.loadDgvBySql("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & " AND (tblSnd_Vorpapier='" & Vorpapier & "' OR tblSnd_Vorpapier2='" & Vorpapier & "' OR tblSnd_Vorpapier3='" & Vorpapier & "' ) ORDER BY tblSnd_PosUnterNr,tblSnd_SendungID", "AVISO").Rows
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
Next
If allowchangeCurrIndex Then CURRENT_INDEX = IIf(SENDUNG_LIST.Count > 0, 0, -1)
@@ -312,6 +343,10 @@ Public Class cSendungen
Me.tblSnd_ATB_T1 = SQL.checkNullReturnValue(dr.Item("tblSnd_ATB_T1"), Nothing)
Me.tblSnd_Vorpapier = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier"), Nothing)
Me.tblSnd_Vorpapier_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier_Pos"), Nothing)
Me.tblSnd_Vorpapier2 = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier2"), Nothing)
Me.tblSnd_Vorpapier2_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier2_Pos"), Nothing)
Me.tblSnd_Vorpapier3 = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3"), Nothing)
Me.tblSnd_Vorpapier3_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier3_Pos"), Nothing)
End If
@@ -488,6 +523,10 @@ Public Class cSendungen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATB_T1", tblSnd_ATB_T1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier", tblSnd_Vorpapier))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier_Pos", tblSnd_Vorpapier_Pos))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier2", tblSnd_Vorpapier2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier2_Pos", tblSnd_Vorpapier2_Pos))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3", tblSnd_Vorpapier3))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier3_Pos", tblSnd_Vorpapier3_Pos))