diff --git a/SDL/Classes/cFinanzOnlineWebService.vb b/SDL/Classes/cFinanzOnlineWebService.vb index 010ab8f5..b078b0d9 100644 --- a/SDL/Classes/cFinanzOnlineWebService.vb +++ b/SDL/Classes/cFinanzOnlineWebService.vb @@ -31,6 +31,28 @@ Public Class cFinanzOnlineWebService Public Shared SESSION_ID As String = "" + Shared Sub initValues() + + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" + tid = "19435107n654" + benid = "WEBserv99" + pin = "WEBserv99" + uid = "ATU68490714" + Case "FRONTOFFICE" + tid = "67493371k039" + benid = "WEBserv99" + pin = "WEBserv99" + uid = "ATU74813856" + Case Else 'VERAG: + tid = "1000103u3032" + benid = "webserv99" + pin = "webserv99" + uid = "ATU53187000" + End Select + End Sub + + Shared Function Call_Web_Service_MethodUID_Login() As Integer Dim CallWebService As New SDL.at.gv.bmf.finanzonlineLogin.sessionService Try @@ -122,6 +144,7 @@ Public Class cFinanzOnlineWebService Dim Firma = "" Dim UID_ERG = Call_Web_Service_MethodUID_Abfrage_NEU2020(txtUid, Firma, tmp_SESSION_ID, msgErgebnis) + If UID_ERG = 0 Or UID_ERG = 1 Then Select Case UID_ERG Case 0 : msgErgebnis = "UID-Nr. GÜLTIG - OK" @@ -159,7 +182,7 @@ Public Class cFinanzOnlineWebService End Function - Shared Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ByVal txtUid As String, Optional ByRef Firma As String = "", Optional ByRef tmp_SESSION_ID As String = "", Optional ByRef msgErgebnis As String = "") As String 'SESSION_ID wir nur zurückgegeben + Shared Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ByVal txtUid As String, Optional ByRef Firma As String = "", Optional ByRef tmp_SESSION_ID As String = "", Optional ByRef msgErgebnis As String = "", Optional SaveErgInAdressenKdNr As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben If Call_Web_Service_MethodUID_Login_NEU2020() <> 0 Then Return -1 End If @@ -169,17 +192,57 @@ Public Class cFinanzOnlineWebService ' Return CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "") 'Dim s() As Object = CallWebService.uidAbfrage(session, tid, benid, My.Resources.UID_Nr, txtUid.Text, uidAbfrageRequestStufe.Item2, "", "", "", "", "", "", "") - Dim msg As String - Dim name As String - Dim adrz1 As String - Dim adrz2 As String - Dim adrz3 As String - Dim adrz4 As String - Dim adrz5 As String - Dim adrz6 As String + Dim msg As String = "" + Dim name As String = "" + Dim adrz1 As String = "" + Dim adrz2 As String = "" + Dim adrz3 As String = "" + Dim adrz4 As String = "" + Dim adrz5 As String = "" + Dim adrz6 As String = "" Dim returnInt As Integer = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, txtUid, VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6) + If returnInt = 0 Or returnInt = 1 Then + + Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung + + UID_TMP.uid_Datum = Now + UID_TMP.uid_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + 'If If(UID_TMP.uid_Sachbearbeiter, "") = "" Then UID_TMP.uid_Sachbearbeiter = "AUTO" + UID_TMP.uid_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + UID_TMP.uid_valid = (returnInt = 0) + If SaveErgInAdressenKdNr > 0 Then UID_TMP.uid_KundenNr = SaveErgInAdressenKdNr + + + UID_TMP.uid_UstIdKz = GetUIDLand(txtUid) + UID_TMP.uid_UstIdNr = GetUidNr(txtUid) + + UID_TMP.Firma = name + UID_TMP.uid_abfrageUid = uid + UID_TMP.uid_sessionId = tmp_SESSION_ID + + UID_TMP.uid_adr1 = adrz1 + UID_TMP.uid_adr2 = adrz2 + UID_TMP.uid_adr3 = adrz3 + UID_TMP.uid_adr4 = adrz4 + UID_TMP.uid_adr5 = adrz5 + UID_TMP.uid_adr6 = adrz6 + + UID_TMP.uid_stufe = 2 + + UID_TMP.SAVE() + If UID_TMP.uid_valid Then + If SaveErgInAdressenKdNr > 0 Then + Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SaveErgInAdressenKdNr) + AD.UstIdGeprüft = Now.ToShortDateString + AD.SAVE() + End If + End If + End If + + + If returnInt = 0 Then Firma = name & vbNewLine & adrz1 If adrz2 <> "" Then Firma = Firma & vbNewLine & adrz2 @@ -206,7 +269,30 @@ Public Class cFinanzOnlineWebService Return "-1" End Function + Shared Function GetUIDLand(uid As String) + If uid.Length > 2 Then + Return uid.Substring(0, 2) + End If + 'Dim uidLand = "" + 'For Each s In uid + ' If IsNumeric(s) Then Return uidLand + ' uidLand &= s + 'Next + 'Return uidLand + End Function + + Shared Function GetUidNr(uid As String) + If uid.Length > 2 Then + Return uid.Substring(2, uid.Length-2) + End If + 'Dim uidLand = "" + 'For Each s In uid + ' If IsNumeric(s) Then uidLand &= s + 'Next + 'Return uidLand + + End Function Shared Function GetCodeText(rc As Integer) Select Case rc Case 0 : Return "Die UID des Erwerbers ist gültig." diff --git a/SDL/Classes/cSDL.vb b/SDL/Classes/cSDL.vb index af6c567a..5ab9bb6c 100644 --- a/SDL/Classes/cSDL.vb +++ b/SDL/Classes/cSDL.vb @@ -12,7 +12,7 @@ Public Class cSDLLeistung Property History As Integer - Public LIST As New List(Of cSDL) + Public LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSDL) Dim SQL As New SQL 'Dim listTodelete As New List(Of cOfferte) @@ -38,7 +38,7 @@ Public Class cSDLLeistung cmd.Parameters.AddWithValue("@SDLNr", SDLNr) Dim dr = cmd.ExecuteReader() While dr.Read - Dim l As New cSDL(dr.Item("KundenNr"), dr.Item("KfzKennzeichen"), dr.Item("SDLNr"), dr.Item("History")) + Dim l As New VERAG_PROG_ALLGEMEIN.cSDL(dr.Item("KundenNr"), dr.Item("KfzKennzeichen"), dr.Item("SDLNr"), dr.Item("History")) LIST.Add(l) End While dr.Close() @@ -67,236 +67,3 @@ Public Class cSDLLeistung 'End Function End Class - - -Public Class cSDL - Property KundenNr As Integer - Property KfzKennzeichen As String = "" - Property SDLNr As Integer - Property History As Integer - Property RefKundenNr As Object = Nothing - Property MSE_Kd_Nr As Object = Nothing - Property TELEPASS_Kd_Nr As Object = Nothing - Property CLIENT_Nr As Object = Nothing - Property BestellNr As Object = Nothing - Property Bestelldatum As Object = Nothing - Property Lieferdatum As Object = Nothing - Property Ausstellungsdatum As Object = Nothing - Property Umstellungsdatum As Object = Nothing - Property KartenNr As Object = Nothing - Property PAN_Nr As Object = Nothing - Property VIACARD As Object = Nothing - Property MOTORWAY_CARD_Nr As Object = Nothing - Property CARD_Nr As Object = Nothing - Property KartenSchlüsselNr As Object = Nothing - Property FREJUS_CARD_Nr As Object = Nothing - Property ECO As Object = Nothing - Property GültigBis As Object = Nothing - Property OBUID As Object = Nothing - Property SERIE_Nr As Object = Nothing - Property TELEPASS_Nr As Object = Nothing - Property Vermerk As Object = Nothing - Property Partner As Object = Nothing - Property BenutzerNr As Object = Nothing - Property PIN As Object = Nothing - Property FlottenPIN As Object = Nothing - Property MasterPIN As Object = Nothing - Property VertragsNr As Object = Nothing - Property Vertragsabschlussdatum As Object = Nothing - Property Kategorie As Object = Nothing - Property Schadstoffklasse As Object = Nothing - Property Status As Object = Nothing - Property Ersatzkarte As Object = Nothing - Property Gesperrt As Object = Nothing - Property Defekt As Object = Nothing - Property Verloren As Object = Nothing - Property Gestohlen As Object = Nothing - Property Erfassungsdatum As Object = Nothing - Property Änderungsdatum As Object = Nothing - Property Sachbearbeiter As Object = Nothing - Property Retourniert As Object = Nothing - Property RetourniertAm As Object = Nothing - - Property GesperrtAm As Object = Nothing - Property DefektAm As Object = Nothing - Property VerlorenAm As Object = Nothing - Property GestohlenAm As Object = Nothing - Property ErsatzkarteAm As Object = Nothing - Property TelepassErsatzkarte As Object = Nothing - Property TelepassErsatzkarteAm As Object = Nothing - Property Archiviert As Boolean = False - Property LKWAbgemeldet As Boolean = False - Property LKWAbgemeldetAM As Object = Nothing - - Property Fahrer As Object = Nothing - Property Kaution As Object = Nothing - Property BelegNr As Object = Nothing - - Dim SQL As New SQL - - Sub New() - - End Sub - - Sub New(KundenNr, KfzKennzeichen, SDLNr, History) - Me.KundenNr = KundenNr - Me.KfzKennzeichen = KfzKennzeichen - Me.SDLNr = SDLNr - Me.History = History - LOAD() - End Sub - Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) - Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) - - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KfzKennzeichen", KfzKennzeichen)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SDLNr", SDLNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("History", History)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RefKundenNr", RefKundenNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MSE-Kd-Nr", MSE_Kd_Nr, "MSE_Kd_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TELEPASS-Kd-Nr", TELEPASS_Kd_Nr, "TELEPASS_Kd_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CLIENT-Nr", CLIENT_Nr, "CLIENT_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BestellNr", BestellNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bestelldatum", Bestelldatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Lieferdatum", Lieferdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ausstellungsdatum", Ausstellungsdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Umstellungsdatum", Umstellungsdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KartenNr", KartenNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PAN-Nr", PAN_Nr, "PAN_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VIACARD", VIACARD)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MOTORWAY-CARD-Nr", MOTORWAY_CARD_Nr, "MOTORWAY_CARD_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CARD-Nr", CARD_Nr, "CARD_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KartenSchlüsselNr", KartenSchlüsselNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FREJUS-CARD-Nr", FREJUS_CARD_Nr, "FREJUS_CARD_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ECO", ECO)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GültigBis", GültigBis)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OBUID", OBUID)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SERIE-Nr", SERIE_Nr, "SERIE_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TELEPASS-Nr", TELEPASS_Nr, "TELEPASS_Nr")) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vermerk", Vermerk)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Partner", Partner)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BenutzerNr", BenutzerNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PIN", PIN)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FlottenPIN", FlottenPIN)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MasterPIN", MasterPIN)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VertragsNr", VertragsNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vertragsabschlussdatum", Vertragsabschlussdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kategorie", Kategorie)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Schadstoffklasse", Schadstoffklasse)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Status", Status)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ersatzkarte", Ersatzkarte)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt", Gesperrt)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Defekt", Defekt)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Verloren", Verloren)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gestohlen", Gestohlen)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erfassungsdatum", Erfassungsdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Änderungsdatum", Änderungsdatum)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Retourniert", Retourniert)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RetourniertAm", RetourniertAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GesperrtAm", GesperrtAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DefektAm", DefektAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VerlorenAm", VerlorenAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GestohlenAm", GestohlenAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ErsatzkarteAm", ErsatzkarteAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TelepassErsatzkarte", TelepassErsatzkarte)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TelepassErsatzkarteAm", TelepassErsatzkarteAm)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Archiviert", Archiviert)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKWAbgemeldet", LKWAbgemeldet)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKWAbgemeldetAM", LKWAbgemeldetAM)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fahrer", Fahrer)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kaution", Kaution)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BelegNr", BelegNr)) - - Return list - End Function - - - - Public Function SAVE() As Boolean - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM SDL WITH(updlock,serializable) WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History) " & - " BEGIN " & getUpdateCmd() & " END " & - " Else " & - " BEGIN " & getInsertCmd() & " END " & - " commit tran " - - Return SQL.doSQLVarList(sqlstr, "SDL", , list) - End Function - - Public Sub LOAD() - Try - Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() - Using cmd As New SqlCommand("SELECT * FROM SDL WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History ", conn) - cmd.Parameters.AddWithValue("@KundenNr", KundenNr) - cmd.Parameters.AddWithValue("@KfzKennzeichen", KfzKennzeichen) - cmd.Parameters.AddWithValue("@SDLNr", SDLNr) - cmd.Parameters.AddWithValue("@History", History) - Dim dr = cmd.ExecuteReader() - If dr.Read Then - For Each l In getParameterList() - Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) - - If dr.Item(l.Text) Is DBNull.Value Then - propInfo.SetValue(Me, Nothing) - Else - propInfo.SetValue(Me, dr.Item(l.Text)) - End If - - Next - - End If - dr.Close() - End Using - End Using - Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) - End Try - End Sub - - - - Public Function getUpdateCmd() As String - Try - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - - Dim str As String = "" - For Each i In list - If Not i.isPrimaryParam Then - str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," - End If - Next - str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [SDL] SET " & str & " WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History ") - - Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) - End Try - Return "" - End Function - - - Public Function getInsertCmd() As String - Try - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim str As String = "" - Dim values As String = "" - For Each i In list - If Not i.isPrimaryParam Then - str &= "[" & i.Text & "]," - values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," - End If - Next - str = str.Substring(0, str.Length - 1) 'wg. ',' - values = values.Substring(0, values.Length - 1) 'wg. ',' - Return (" INSERT INTO SDL (" & str & ") VALUES(" & values & ") ") - Catch ex As Exception - MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) - End Try - Return "" - End Function - - - -End Class diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb index daab6828..d16261b9 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungHUGO.vb @@ -16,7 +16,7 @@ Public Class usrCntlSDLLeistungHUGO Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False @@ -82,7 +82,7 @@ Public Class usrCntlSDLLeistungHUGO Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb index 20ea16b2..d025794f 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautAT.vb @@ -14,7 +14,7 @@ Public Class usrCntlSDLLeistungMautAT Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -59,7 +59,7 @@ Public Class usrCntlSDLLeistungMautAT Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtVertragabschlussdatum) PROG.initDTPE(txtUmstellungsdatum) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautDE.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautDE.vb index 887d8263..08ab6c1b 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautDE.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungMautDE.vb @@ -16,7 +16,7 @@ Public Class usrCntlSDLLeistungMautDE Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -64,7 +64,7 @@ Public Class usrCntlSDLLeistungMautDE End Sub Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb index 94964114..fd09a6ad 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungPLOSE.vb @@ -16,7 +16,7 @@ Public Class usrCntlSDLLeistungPLOSE Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False @@ -83,7 +83,7 @@ Public Class usrCntlSDLLeistungPLOSE Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCard.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCard.vb index 4a0016ba..aeab298f 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCard.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCard.vb @@ -16,7 +16,7 @@ Public Class usrCntlSDLLeistungVERAGCard Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -61,7 +61,7 @@ Public Class usrCntlSDLLeistungVERAGCard End Sub Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtBestelldatum) PROG.initDTPE(txtLieferung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenCZ.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenCZ.vb index 7aea47d0..560a246d 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenCZ.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenCZ.vb @@ -10,7 +10,7 @@ Public Class usrCntlSDLLeistungenCZ Dim culture As CultureInfo = New CultureInfo("de-DE") Private PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll Public addnew As Boolean = False - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL ' Public WithEvents s As New cBinding 'fürs Binding Public Event CHANGED(kdNr, newKfz, SDLNr, History) Dim VAL As New cValidationSDLLeistungen @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenCZ If addnew Then newEntry() 'NEUER EINTRAG! - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenDUOBOX.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenDUOBOX.vb index 8afd6c0e..8ecf1b93 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenDUOBOX.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenDUOBOX.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenDUOBOX Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -73,8 +73,8 @@ Public Class usrCntlSDLLeistungenDUOBOX Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) - + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) + PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) PROG.initDTPE(txtGueltigkeit2) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenECOTAX.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenECOTAX.vb index 90ec9ae0..574644d2 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenECOTAX.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenECOTAX.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenECOTAX Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -73,7 +73,7 @@ Public Class usrCntlSDLLeistungenECOTAX Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFR.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFR.vb index da4f93fd..868aa754 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFR.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFR.vb @@ -14,7 +14,7 @@ Public Class usrCntlSDLLeistungenFR Dim VAL As New cValidationSDLLeistungen Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL ' Public WithEvents s As New cBinding 'fürs Binding Dim boud = False @@ -76,7 +76,7 @@ Public Class usrCntlSDLLeistungenFR ' Dim tmpHist As String = "" 'If History <> "" Then tmpHist = " AND History='" & History & "'" ' s.initBinding("SELECT * FROM SDL WHERE KundenNr='" & kdNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' " & tmpHist, "SDL") - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) ' AddHandler s.bindingdataTable.ColumnChanged, AddressOf BindingTableColumnChanged 'AddHandler s.bindingdataTable.TableNewRow, AddressOf s.bindingdataTable_TableNewRow_SDLLeistungen diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFREJUS.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFREJUS.vb index b40f1894..f5e4c3e1 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFREJUS.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenFREJUS.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenFREJUS Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenFREJUS Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb index 1654cff8..3a8f6bc8 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIDS.vb @@ -13,7 +13,7 @@ Public Class usrCntlSDLLeistungenIDS Public addnew As Boolean = False Dim VAL As New cValidationSDLLeistungen 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) Dim boud = False @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenIDS ' Dim tmpHist As String = "" 'If History <> "" Then tmpHist = " AND History='" & History & "'" ' s.initBinding("SELECT * FROM SDL WHERE KundenNr='" & kdNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' " & tmpHist, "SDL") - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) ' AddHandler s.bindingdataTable.ColumnChanged, AddressOf BindingTableColumnChanged 'AddHandler s.bindingdataTable.TableNewRow, AddressOf s.bindingdataTable_TableNewRow_SDLLeistungen diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIT.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIT.vb index dadd8db5..8097dce2 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIT.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenIT.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenIT Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -73,7 +73,7 @@ Public Class usrCntlSDLLeistungenIT Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMANAbgas.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMANAbgas.vb index fcff4b46..3858860f 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMANAbgas.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMANAbgas.vb @@ -13,7 +13,7 @@ Public Class usrCntlSDLLeistungenMANAbgas Public addnew As Boolean = False Dim VAL As New cValidationSDLLeistungen 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) Dim boud = False @@ -66,9 +66,9 @@ Public Class usrCntlSDLLeistungenMANAbgas Sub initDataBinding() Try - - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) - + + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) + PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMSE.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMSE.vb index 297522f4..d6dd0d21 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMSE.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMSE.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenMSE Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False @@ -70,7 +70,7 @@ Public Class usrCntlSDLLeistungenMSE Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMotorWayMaut.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMotorWayMaut.vb index 010ed724..7d636e1c 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMotorWayMaut.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenMotorWayMaut.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenMotorWayMaut Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -71,7 +71,7 @@ Public Class usrCntlSDLLeistungenMotorWayMaut Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPL.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPL.vb index 58e8f75a..5853cdbc 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPL.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPL.vb @@ -13,7 +13,7 @@ Public Class usrCntlSDLLeistungenPL Public addnew As Boolean = False 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) Dim VAL As New cValidationSDLLeistungen @@ -73,7 +73,7 @@ Public Class usrCntlSDLLeistungenPL Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb index f5ba14f5..b571be2c 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_CZ.vb @@ -10,7 +10,7 @@ Public Class usrCntlSDLLeistungenPLOSE_CZ Dim culture As CultureInfo = New CultureInfo("de-DE") Private PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll Public addnew As Boolean = False - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL ' Public WithEvents s As New cBinding 'fürs Binding Public Event CHANGED(kdNr, newKfz, SDLNr, History) Dim VAL As New cValidationSDLLeistungen @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenPLOSE_CZ If addnew Then newEntry() 'NEUER EINTRAG! - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb index 307d5851..904819ea 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_IT.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenPLOSE_IT Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False Sub New(kdNr, KfzKennzeichen, SDLNr, History) @@ -73,7 +73,7 @@ Public Class usrCntlSDLLeistungenPLOSE_IT Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenSI.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenSI.vb index bfa51402..a37bae99 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenSI.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenSI.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenSI Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False @@ -75,7 +75,7 @@ Public Class usrCntlSDLLeistungenSI Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb index fe69a12d..a1c3779b 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb @@ -15,7 +15,7 @@ Public Class usrCntlSDLLeistungenUTA Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Dim boud = False @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenUTA Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb index 62b3c805..8e65a516 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenWOELFL.vb @@ -11,7 +11,7 @@ Public Class usrCntlSDLLeistungenWOELFL Public addnew As Boolean = False 'Public WithEvents s As New cBinding 'fürs Binding - Public SDL As cSDL + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL Public Event LKWChanged(kdNr, newKfz, SDLNr, History) Public Event CHANGED(kdNr, newKfz, SDLNr, History) Public PROG As New cProgramFunctions @@ -72,7 +72,7 @@ Public Class usrCntlSDLLeistungenWOELFL End Function Sub initDataBinding() Try - SDL = New cSDL(kdNr, KfzKennzeichen, SDLNr, History) + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) PROG.initDTPE(txtLieferung) PROG.initDTPE(txtBestellung) diff --git a/VERAG_PROG_ALLGEMEIN/App.config b/VERAG_PROG_ALLGEMEIN/App.config index 0c0825fa..de3d9890 100644 --- a/VERAG_PROG_ALLGEMEIN/App.config +++ b/VERAG_PROG_ALLGEMEIN/App.config @@ -14,7 +14,7 @@ + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" /> + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" /> + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> + connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> Data Source=192.168.0.99;Initial Catalog=Therefore;Integrated Security=false;User ID=sa;Password=BmWr501956; - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 @@ -72,6 +72,9 @@ serializeAs="String"> https://finanzonline.bmf.gv.at:443/fonws/ws/session + + asdasdasd + diff --git a/VERAG_PROG_ALLGEMEIN/Classes/_BASE.vb b/VERAG_PROG_ALLGEMEIN/Classes/_BASE.vb new file mode 100644 index 00000000..a0dc3f89 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/_BASE.vb @@ -0,0 +1,110 @@ + +Imports System.Data.SqlClient +Imports System.Reflection + +Public Class _BASE + Property _BASE_id As Integer + Property _BASE_value As Object = Nothing + + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New(_BASE_id) + Me._BASE_id = _BASE_id + LOAD() + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("_BASE_id", _BASE_id,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("_BASE_value", _BASE_value)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblTABLE WHERE _BASE_id=@_BASE_id) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblTABLE WHERE _BASE_id=@_BASE_id ", conn) + cmd.Parameters.AddWithValue("@_BASE_id", _BASE_id) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each l In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) + + If dr.Item(l.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(l.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [tblTABLE] SET " & str & " WHERE _BASE_id=@_BASE_id ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblTABLE (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenSDL.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenSDL.vb new file mode 100644 index 00000000..aa8b95ab --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenSDL.vb @@ -0,0 +1,141 @@ + + +Imports System.Data.SqlClient + Imports System.Reflection + +Public Class cKundenSDL + Property KundenNr As Integer + Property SDLNr As Integer + Property Sperre As Integer + Property Sperrdatum As Object = Nothing + Property Vertretungsvollmacht As Object = Nothing + Property Auszahlungsvollmacht As Object = Nothing + Property Finanzamtbestätigung As Object = Nothing + Property Vermerk As Object = Nothing + Property Antragsdatum As Object = Nothing + Property Erfassungsdatum As Object = Nothing + Property Änderungsdatum As Object = Nothing + Property Sachbearbeiter As Object = Nothing + Property MautDE_FlottenPIN As Object = Nothing + Property MautDE_MasterPIN As Object = Nothing + Property MautDE_BenutzerNr As Object = Nothing + Property MautAT_KartenNr As Object = Nothing + + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New(KundenNr, SDLNr) + Me.KundenNr = KundenNr + Me.SDLNr = SDLNr + LOAD() + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SDLNr", SDLNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sperre", Sperre)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sperrdatum", Sperrdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vertretungsvollmacht", Vertretungsvollmacht)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Auszahlungsvollmacht", Auszahlungsvollmacht)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Finanzamtbestätigung", Finanzamtbestätigung)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vermerk", Vermerk)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Antragsdatum", Antragsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erfassungsdatum", Erfassungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Änderungsdatum", Änderungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MautDE_FlottenPIN", MautDE_FlottenPIN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MautDE_MasterPIN", MautDE_MasterPIN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MautDE_BenutzerNr", MautDE_BenutzerNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MautAT_KartenNr", MautAT_KartenNr)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM KundenSDL WHERE KundenNr=@KundenNr and SDLNr=@SDLNr) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "SDL", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionSDL() + Using cmd As New SqlCommand("SELECT * FROM KundenSDL WHERE KundenNr=@KundenNr and SDLNr=@SDLNr ", conn) + cmd.Parameters.AddWithValue("@KundenNr", KundenNr) + cmd.Parameters.AddWithValue("@SDLNr", SDLNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each l In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) + + If dr.Item(l.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(l.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [KundenSDL] SET " & str & " WHERE KundenNr=@KundenNr and SDLNr=@SDLNr ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO KundenSDL (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb new file mode 100644 index 00000000..0fdec616 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb @@ -0,0 +1,249 @@ + + +Imports System.Data.SqlClient +Imports System.Reflection + +Public Class cSDL + Property KundenNr As Integer + Property KfzKennzeichen As String = "" + Property SDLNr As Integer + Property History As Integer + Property RefKundenNr As Object = Nothing + Property MSE_Kd_Nr As Object = Nothing + Property TELEPASS_Kd_Nr As Object = Nothing + Property CLIENT_Nr As Object = Nothing + Property BestellNr As Object = Nothing + Property Bestelldatum As Object = Nothing + Property Lieferdatum As Object = Nothing + Property Ausstellungsdatum As Object = Nothing + Property Umstellungsdatum As Object = Nothing + Property KartenNr As Object = Nothing + Property PAN_Nr As Object = Nothing + Property VIACARD As Object = Nothing + Property MOTORWAY_CARD_Nr As Object = Nothing + Property CARD_Nr As Object = Nothing + Property KartenSchlüsselNr As Object = Nothing + Property FREJUS_CARD_Nr As Object = Nothing + Property ECO As Object = Nothing + Property GültigBis As Object = Nothing + Property OBUID As Object = Nothing + Property SERIE_Nr As Object = Nothing + Property TELEPASS_Nr As Object = Nothing + Property Vermerk As Object = Nothing + Property Partner As Object = Nothing + Property BenutzerNr As Object = Nothing + Property PIN As Object = Nothing + Property FlottenPIN As Object = Nothing + Property MasterPIN As Object = Nothing + Property VertragsNr As Object = Nothing + Property Vertragsabschlussdatum As Object = Nothing + Property Kategorie As Object = Nothing + Property Schadstoffklasse As Object = Nothing + Property Status As Object = Nothing + Property Ersatzkarte As Object = Nothing + Property Gesperrt As Object = Nothing + Property Defekt As Object = Nothing + Property Verloren As Object = Nothing + Property Gestohlen As Object = Nothing + Property Erfassungsdatum As Object = Nothing + Property Änderungsdatum As Object = Nothing + Property Sachbearbeiter As Object = Nothing + Property Retourniert As Object = Nothing + Property RetourniertAm As Object = Nothing + + Property GesperrtAm As Object = Nothing + Property DefektAm As Object = Nothing + Property VerlorenAm As Object = Nothing + Property GestohlenAm As Object = Nothing + Property ErsatzkarteAm As Object = Nothing + Property TelepassErsatzkarte As Object = Nothing + Property TelepassErsatzkarteAm As Object = Nothing + Property Archiviert As Boolean = False + Property LKWAbgemeldet As Boolean = False + Property LKWAbgemeldetAM As Object = Nothing + + Property Fahrer As Object = Nothing + Property Kaution As Object = Nothing + Property BelegNr As Object = Nothing + + + Public hasentry + Dim SQL As New SQL + + Sub New() + + End Sub + + Sub New(KundenNr, KfzKennzeichen, SDLNr, History) + Me.KundenNr = KundenNr + Me.KfzKennzeichen = KfzKennzeichen + Me.SDLNr = SDLNr + Me.History = History + LOAD() + End Sub + + + Sub New(KundenNr, KfzKennzeichen, SDLNr) + Me.KundenNr = KundenNr + Me.KfzKennzeichen = KfzKennzeichen + Me.SDLNr = SDLNr + Me.History = SQL.getValueTxtBySql("SELECT TOP 1 History FROM SDL WHERE KundenNr='" & KundenNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' ORDER BY History DESC", "SDL") + LOAD() + End Sub + + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KfzKennzeichen", KfzKennzeichen)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SDLNr", SDLNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("History", History)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RefKundenNr", RefKundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MSE-Kd-Nr", MSE_Kd_Nr, "MSE_Kd_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TELEPASS-Kd-Nr", TELEPASS_Kd_Nr, "TELEPASS_Kd_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CLIENT-Nr", CLIENT_Nr, "CLIENT_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BestellNr", BestellNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bestelldatum", Bestelldatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Lieferdatum", Lieferdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ausstellungsdatum", Ausstellungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Umstellungsdatum", Umstellungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KartenNr", KartenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PAN-Nr", PAN_Nr, "PAN_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VIACARD", VIACARD)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MOTORWAY-CARD-Nr", MOTORWAY_CARD_Nr, "MOTORWAY_CARD_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CARD-Nr", CARD_Nr, "CARD_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KartenSchlüsselNr", KartenSchlüsselNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FREJUS-CARD-Nr", FREJUS_CARD_Nr, "FREJUS_CARD_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ECO", ECO)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GültigBis", GültigBis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OBUID", OBUID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SERIE-Nr", SERIE_Nr, "SERIE_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TELEPASS-Nr", TELEPASS_Nr, "TELEPASS_Nr")) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vermerk", Vermerk)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Partner", Partner)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BenutzerNr", BenutzerNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PIN", PIN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FlottenPIN", FlottenPIN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MasterPIN", MasterPIN)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VertragsNr", VertragsNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vertragsabschlussdatum", Vertragsabschlussdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kategorie", Kategorie)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Schadstoffklasse", Schadstoffklasse)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Status", Status)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ersatzkarte", Ersatzkarte)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt", Gesperrt)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Defekt", Defekt)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Verloren", Verloren)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gestohlen", Gestohlen)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erfassungsdatum", Erfassungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Änderungsdatum", Änderungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Retourniert", Retourniert)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RetourniertAm", RetourniertAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GesperrtAm", GesperrtAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DefektAm", DefektAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VerlorenAm", VerlorenAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GestohlenAm", GestohlenAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ErsatzkarteAm", ErsatzkarteAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TelepassErsatzkarte", TelepassErsatzkarte)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TelepassErsatzkarteAm", TelepassErsatzkarteAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Archiviert", Archiviert)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKWAbgemeldet", LKWAbgemeldet)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LKWAbgemeldetAM", LKWAbgemeldetAM)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fahrer", Fahrer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kaution", Kaution)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BelegNr", BelegNr)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM SDL WITH(updlock,serializable) WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "SDL", , list) + End Function + + Public Sub LOAD() + Try + hasentry = False + Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using cmd As New SqlCommand("SELECT * FROM SDL WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History ", conn) + cmd.Parameters.AddWithValue("@KundenNr", KundenNr) + cmd.Parameters.AddWithValue("@KfzKennzeichen", KfzKennzeichen) + cmd.Parameters.AddWithValue("@SDLNr", SDLNr) + cmd.Parameters.AddWithValue("@History", History) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each l In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) + + If dr.Item(l.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(l.Text)) + End If + + Next + hasentry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [SDL] SET " & str & " WHERE KundenNr=@KundenNr AND KfzKennzeichen=@KfzKennzeichen AND SDLNr=@SDLNr AND History=@History ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO SDL (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSDL_LKW.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSDL_LKW.vb new file mode 100644 index 00000000..ec3c64ec --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSDL_LKW.vb @@ -0,0 +1,138 @@ + + + +Imports System.Data.SqlClient + Imports System.Reflection +Public Class cSDL_LKW + Property KundenNr As Integer + Property KfzKennzeichen As String + Property Nationalität As Object = Nothing + Property Verkauft As Object = Nothing + Property Abgemeldet As Object = Nothing + Property Vermerk As Object = Nothing + Property Erfassungsdatum As Object = Nothing + Property Änderungsdatum As Object = Nothing + Property Sachbearbeiter As Object = Nothing + Property KZAenderung As Object = Nothing + Property ts As Object = Nothing + Property Baujahr As Object = Nothing + Property KzMiete As Object = Nothing + Property KzLeasing As Object = Nothing + Property KzFinanzierungBank As Object = Nothing + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New(KundenNr, KfzKennzeichen) + Me.KundenNr = KundenNr + Me.KfzKennzeichen = KfzKennzeichen + LOAD() + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KfzKennzeichen", KfzKennzeichen)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Nationalität", Nationalität)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Verkauft", Verkauft)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Abgemeldet", Abgemeldet)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vermerk", Vermerk)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Erfassungsdatum", Erfassungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Änderungsdatum", Änderungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KZAenderung", KZAenderung)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Baujahr", Baujahr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KzMiete", KzMiete)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KzLeasing", KzLeasing)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KzFinanzierungBank", KzFinanzierungBank)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM LKW WHERE KundenNr=@KundenNr and KfzKennzeichen=@KfzKennzeichen) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "SDL", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionSDL() + Using cmd As New SqlCommand("SELECT * FROM LKW WHERE KundenNr=@KundenNr and KfzKennzeichen=@KfzKennzeichen ", conn) + cmd.Parameters.AddWithValue("@KundenNr", KundenNr) + cmd.Parameters.AddWithValue("@KfzKennzeichen", KfzKennzeichen) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each l In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) + + If dr.Item(l.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(l.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [LKW] SET " & str & " WHERE KundenNr=@KundenNr and KfzKennzeichen=@KfzKennzeichen ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO LKW (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 3028e856..027ae0d4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -15,11 +15,22 @@ Public Class cUIDPruefung Property uid_MaId As Object = Nothing Property uid_Sachbearbeiter As String Property uid_firma As Object = Nothing - Property uid_strasse As Object = Nothing - Property uid_plz As Object = Nothing - Property uid_ort As Object = Nothing + Property uid_stufe As Integer = 1 + Property Firma As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Property uid_abfrageUid As Object = Nothing + Property uid_sessionId As Object = Nothing + + + + Property uid_adr1 As Object = Nothing + Property uid_adr2 As Object = Nothing + Property uid_adr3 As Object = Nothing + Property uid_adr4 As Object = Nothing + Property uid_adr5 As Object = Nothing + Property uid_adr6 As Object = Nothing + Shared SQL As New SQL @@ -42,10 +53,19 @@ Public Class cUIDPruefung list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_MaId", uid_MaId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_Sachbearbeiter", uid_Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_firma", uid_firma)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_strasse", uid_strasse)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_plz", uid_plz)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_ort", uid_ort)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_stufe", uid_stufe)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", Firma)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_abfrageUid", uid_abfrageUid)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_sessionId", uid_sessionId)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr1", uid_adr1)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr2", uid_adr2)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr3", uid_adr3)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr4", uid_adr4)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr5", uid_adr5)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr6", uid_adr6)) Return list End Function @@ -219,6 +239,9 @@ Public Class cUIDPruefung UID_TMP.uid_UstIdKz = AD.UstIdKz UID_TMP.uid_UstIdNr = AD.UstIdNr + UID_TMP.uid_stufe = 1 + + UID_TMP.uid_abfrageUid = requesterCountryCode & requesterVatNumber ' UID.uid_firma = ' UID.uid_strasse)) 'UID.uid_plz)) diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index 8789d69f..b5ec25b6 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -75,12 +75,12 @@ Namespace My Return CType(Me("FMZOLL_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ADMINConnectionString() As String Get Return CType(Me("ADMINConnectionString"),String) @@ -108,13 +108,13 @@ Namespace My Return CType(Me("FMZOLLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property AVISOConnectionString() As String Get Return CType(Me("AVISOConnectionString"),String) @@ -132,29 +132,17 @@ Namespace My Return CType(Me("SDLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property EZOLLConnectionString() As String Get Return CType(Me("EZOLLConnectionString"),String) End Get End Property - - - Public ReadOnly Property AVISO_ATILLAConnectionString() As String - Get - Return CType(Me("AVISO_ATILLAConnectionString"),String) - End Get - End Property + + _ Public ReadOnly Property UID_PRODConnectionString() As String Get Return CType(Me("UID_PRODConnectionString"),String) @@ -213,12 +201,12 @@ Namespace My Me("SCANCANON_PRODConnectionString") = value End Set End Property - - + + _ Public ReadOnly Property FDConnectionString() As String Get Return CType(Me("FDConnectionString"),String) @@ -245,12 +233,12 @@ Namespace My Return CType(Me("VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService"),String) End Get End Property - - + + _ Public Property DISPOConnectionString() As String Get Return CType(Me("DISPOConnectionString"),String) @@ -302,6 +290,27 @@ Namespace My Me("asdadasdasdasdasdasd") = value End Set End Property + + _ + Public ReadOnly Property asdasdasdasd() As String + Get + Return CType(Me("asdasdasdasd"),String) + End Get + End Property + + _ + Public ReadOnly Property AVISO_ATILLAConnectionString() As String + Get + Return CType(Me("AVISO_ATILLAConnectionString"),String) + End Get + End Property End Class End Namespace diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings index b9c135fe..6a74a350 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -19,9 +19,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> </SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; <?xml version="1.0" encoding="utf-16"?> @@ -40,9 +40,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> </SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 <?xml version="1.0" encoding="utf-16"?> @@ -54,16 +54,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> </SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956; - - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> -</SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956; <?xml version="1.0" encoding="utf-16"?> @@ -82,9 +75,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> </SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956; <?xml version="1.0" encoding="utf-16"?> @@ -99,9 +92,9 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> </SerializableConnectionString> - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956; + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956; <?xml version="1.0" encoding="utf-16"?> @@ -114,7 +107,7 @@ http://ec.europa.eu/taxation_customs/vies/services/checkVatService - Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 <?xml version="1.0" encoding="utf-16"?> @@ -132,5 +125,15 @@ + + asdasdasd + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> +</SerializableConnectionString> + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200 + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 6daa8fb0..530d1a7d 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -313,6 +313,7 @@ +