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

2
VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
View File

@@ -504,7 +504,7 @@ Public Class SQL
Function DLookup(srchField, table, where, Optional conn_art = "SDL", Optional nullvalue = "") As Object
Return getValueTxtBySql("SELECT isnull(" & srchField & ",'" & nullvalue & "') FROM " & table & " WHERE " & where & "", conn_art)
Return getValueTxtBySql("SELECT isnull(" & srchField & ",'" & nullvalue & "') FROM " & table & " WHERE " & where & "", conn_art,,, nullvalue)
End Function

7
VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb
View File

@@ -11,6 +11,7 @@ Public Class cAvisoAnhaenge
Property anh_Typ As String
Property anh_Reihenfolge As Integer = 99
Property anh_LaufzettelDruck As Boolean = False
Property anh_GestellungslisteAnfuegen As Boolean = False
Public hasEntry As Boolean = False
@@ -50,6 +51,7 @@ Public Class cAvisoAnhaenge
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Typ", anh_Typ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Reihenfolge", anh_Reihenfolge))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_LaufzettelDruck", anh_LaufzettelDruck))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_GestellungslisteAnfuegen", anh_GestellungslisteAnfuegen))
Return list
End Function
@@ -170,4 +172,9 @@ Public Class cAvisoAnhaenge
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
Public Shared Function toggleGestellungslisteAnfuegen(id As Integer) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " UPDATE [tblAvisoAnhaenge] SET [anh_GestellungslisteAnfuegen] = 1 - [anh_GestellungslisteAnfuegen] WHERE anh_id=" & id
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
End Class

8
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -11,6 +11,8 @@ Public Class cKundenErweitert
Property kde_qsTeamMAId As Object = Nothing
Property kde_qsTeamMAName As Object = Nothing
Property kde_qsTeamName As Object = Nothing
Property kde_TeamId As Object = Nothing
Property kde_TeamMAId As Object = Nothing
'Property kde_Hoechstkredit As Object = Nothing
Property kde_Versicherung_Deckungsstopp As Boolean = False
@@ -35,6 +37,8 @@ Public Class cKundenErweitert
Property EmailFreigabe_SteuerbescheidPDF_Bedingung As Integer
Property EmailFreigabe_VBDPDF As Boolean = False
Property EmailFreigabe_ABDPDF As Boolean = False
Property Email_AVM As Boolean = False
Property Depot_Kunde As Boolean = False
Property FiBuSchnittstelleLG As Boolean = False
@@ -73,6 +77,8 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_qsTeamMAId", kde_qsTeamMAId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_qsTeamMAName", kde_qsTeamMAName))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_qsTeamName", kde_qsTeamName))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_TeamId", kde_TeamId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_TeamMAId", kde_TeamMAId))
' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Hoechstkredit", kde_Hoechstkredit))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Versicherung_Deckungsstopp", kde_Versicherung_Deckungsstopp))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Versicherung_DeckungsstoppDatum", kde_Versicherung_DeckungsstoppDatum))
@@ -94,6 +100,8 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailFreigabe_SteuerbescheidPDF", EmailFreigabe_SteuerbescheidPDF))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailFreigabe_SteuerbescheidPDF_Bedingung", EmailFreigabe_SteuerbescheidPDF_Bedingung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailFreigabe_VBDPDF", EmailFreigabe_VBDPDF))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("EmailFreigabe_ABDPDF", EmailFreigabe_ABDPDF))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Email_AVM", Email_AVM))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Depot_Kunde", Depot_Kunde))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FiBuSchnittstelleLG", FiBuSchnittstelleLG))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zahlungsziel2", Zahlungsziel2))

6
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsnummern.vb
View File

@@ -43,13 +43,13 @@ Public Class cRechnungsnummern
Case 21 ' UNISPED AT
VonRechnungsNr = Now.ToString("yy") & "7000000"
BisRechnungsNr = Now.ToString("yy") & "799999"
BisRechnungsNr = Now.ToString("yy") & "7999999"
Case 22 ' UNISPED DE
VonRechnungsNr = Now.ToString("yy") & "9000000"
BisRechnungsNr = Now.ToString("yy") & "999999"
BisRechnungsNr = Now.ToString("yy") & "9999999"
Case 23 ' UNISPED Zollservice
VonRechnungsNr = Now.ToString("yy") & "5000000"
BisRechnungsNr = Now.ToString("yy") & "599999"
BisRechnungsNr = Now.ToString("yy") & "5999999"
End Select
LfdRechnungsNr = VonRechnungsNr
'-------------------------------------

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))

6
VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
View File

@@ -174,6 +174,8 @@ Public Class cSpeditionsbuch
Property DokumentId_Steuerbeleg As Object = Nothing
Property DokumentId_Mitteilung As Object = Nothing
Property DokumentId_VBD As Object = Nothing
Property DokumentId_ABD As Object = Nothing
Property DokumentId_AVM As Object = Nothing
Property FilialenNrHandling As Object = Nothing
Property HandlingZuKassieren As Double = 0
@@ -337,6 +339,8 @@ Public Class cSpeditionsbuch
Me.DokumentId_Steuerbeleg = SQL.checkNullReturnValue(dr.Item("DokumentId_Steuerbeleg"), Nothing)
Me.DokumentId_Mitteilung = SQL.checkNullReturnValue(dr.Item("DokumentId_Mitteilung"), Nothing)
Me.DokumentId_VBD = SQL.checkNullReturnValue(dr.Item("DokumentId_VBD"), Nothing)
Me.DokumentId_ABD = SQL.checkNullReturnValue(dr.Item("DokumentId_ABD"), Nothing)
Me.DokumentId_AVM = SQL.checkNullReturnValue(dr.Item("DokumentId_avm"), Nothing)
Me.FilialenNrHandling = SQL.checkNullReturnValue(dr.Item("FilialenNrHandling"), Nothing)
Me.FilialenNrAbklaerung = SQL.checkNullReturnValue(dr.Item("FilialenNrAbklaerung"), Nothing)
Me.HandlingZuKassieren = SQL.checkNulDbl(dr.Item("HandlingZuKassieren"))
@@ -486,6 +490,8 @@ Public Class cSpeditionsbuch
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DokumentId_Steuerbeleg", DokumentId_Steuerbeleg))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DokumentId_Mitteilung", DokumentId_Mitteilung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DokumentId_VBD", DokumentId_VBD))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DokumentId_ABD", DokumentId_ABD))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DokumentId_AVM", DokumentId_AVM))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNrHandling", FilialenNrHandling))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNrAbklaerung", FilialenNrAbklaerung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("HandlingZuKassieren", HandlingZuKassieren))