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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-06-12 14:03:59 +02:00
parent 5d9fe6cd5a dcd8721f03
commit b64b15fea0
32 changed files with 1416 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb
View File

@@ -31,6 +31,7 @@ Public Enum cAPI_ART
AVISO_OUT_SAMMELRECHNUNG = 84
AVISO_OUT_EINZELRECHNUNG = 85
SDL_OUT_RS_ORIGINALRECHNUNGEN = 86
SDL_OUT_MDM_AUSWERTUNG = 87
End Enum

5
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -1,5 +1,6 @@
Imports System.Data.SqlClient
Imports System.Reflection
Imports System.Text.RegularExpressions
Public Class cAdressen
Property Auswahl As Object = Nothing
@@ -166,7 +167,7 @@ Public Class cAdressen
'Prüfung Neuanlage: Nur Hinweismeldung! -> speichern soll trotzdem möglich sein!
If checkUID(KD, kundenNameUID, UIDMehfachverwendung) Then ERROR_TXT = "Die UID Nummer existiert bereits " & kundenNameUID & "!" & vbNewLine & "Bitte prüfen, damit es zu keiner doppelten Erfassung des Kunden kommt." : Return False
Else
Try
Try
Dim kunde = DirectCast(KD, cKunde)
Dim addresseTemp = New cAdressen(kunde.KundenNr)
If Not (addresseTemp.UstIdKz = UstIdKz And addresseTemp.UstIdNr = UstIdNr) Then
@@ -314,7 +315,7 @@ Public Class cAdressen
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND (WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr & ") " & IIf(isWoelfKdNr, " AND (AdressenNr LIKE '15%' or AdressenNr LIKE '18%')", ""), conn)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & Regex.Replace(UIDNr, "[^0-9.-]", "") & "') AND (WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr & ") " & IIf(isWoelfKdNr, " AND (AdressenNr LIKE '15%' or AdressenNr LIKE '18%')", ""), conn)
Dim dr = cmd.ExecuteReader()
If dr.Read Then

5
VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb
View File

@@ -13,6 +13,9 @@ Public Class cMDMEinarbeitung
Property completed_date As Object = Nothing
Property import_date As Object = Nothing
Property importfilename As Object = Nothing
Property billingdate As Object = Nothing
Property billing_completed As Boolean = False
Public hasEntry = False
@@ -48,6 +51,8 @@ Public Class cMDMEinarbeitung
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("completed_date", completed_date))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("import_date", import_date))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("importfilename", importfilename))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("billingdate", billingdate))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("billing_completed", billing_completed))
Return list
End Function

2
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -1,8 +1,6 @@

Imports System.Data.SqlClient
Imports System.Reflection
Imports System.Web.Configuration
Imports io.konik.zugferd
Public Class cRMC
Property rmc_id As Integer

1
VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
View File

@@ -317,6 +317,7 @@ Public Class cUIDPruefung
Case "AMBAR" : where = " And Filialen.FilialenNr IN (5701) "
Case "IMEX" : where = " And Filialen.FilialenNr IN (5501) "
Case "ATILLA" : where = " And Filialen.FilialenNr IN (4801) "
Case "VERAG 360 GmbH" : where = " And Filialen.FilialenNr IN (8001) "
Case "UNISPED" : where = " AND Filialen.firma='UNISPED' "
Case Else : where = " AND Filialen.firma='VERAG' " '" And isnull(FilialenNr,'') Not IN (5501,5701)"
End Select

1
VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
View File

@@ -5,7 +5,6 @@ Imports System.Net
Imports System.Reflection
Imports System.Text.RegularExpressions
Imports System.Threading
Imports iTextSharp.text.pdf
Public Class cCreditSafeAPI