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

div. Änderungen

Browse Source
This commit is contained in:
d.breimaier
2026-03-18 10:19:52 +01:00
parent 72a2def23b
commit b143e5bf13
23 changed files with 1254 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb
View File

@@ -17,24 +17,18 @@ Public Class cUIDPruefung
Property uid_MaId As Object = Nothing
Property uid_Sachbearbeiter As String
Property uid_firma 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
Property uid_pruefungstool As Object = Nothing
Property uid_typ As Object = Nothing
Shared SQL As New SQL
@@ -57,21 +51,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_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))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_pruefungstool", uid_pruefungstool))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_typ", uid_typ))
Return list
End Function
@@ -238,7 +230,18 @@ Public Class cUIDPruefung
counter += 1
Dim errorCode = -99
Dim errormsg = ""
Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
Dim UID_TMP = Nothing
'unterscheidung nach typ!
If Not IsDBNull(r("typ")) AndAlso r("typ") = "VAK" Then
UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(r("KdNr"), r("UstIdKz"), r("UstIdNr"), r("letzte Prüfung"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
Else
UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
End If
If UID_TMP IsNot Nothing Then
If UID_TMP.uid_valid Then
r("Ergebnis") = "OK"
@@ -325,24 +328,34 @@ Public Class cUIDPruefung
End If
If Validierungspruefung Then
where &= " AND UPPER(Adressen.UstIdKz) IN (
where &= " AND UPPER(Adressen.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
)"
End If
dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE
Dim SQLUID As String = "SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE
WHEN UPPER(Adressen.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
) THEN 'Ja'
ELSE 'Nein'
END AS istEUVAT " &
END AS istEUVAT, 'UID' as typ " &
" From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " &
" where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> '' and isnull(Adressen.UstIdNr,'') <> '') " &
" And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL")
" And Auswahl='A' " & where
Dim SQLUID_Veranlagungskunden As String = "SELECT VAUID.KdNr,[Ordnungsbegriff] as Firma, VAUID.UstIdGeprüft, VAUID.UstIdKz,VAUID.UstIdNr, CASE WHEN UPPER(VAUID.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
) THEN 'Ja'
ELSE 'Nein' END AS istEUVAT , 'VAK' as typ FROM [VERAG].[dbo].[tblKundenveranlagungUID] as VAUID
inner Join [Adressen] On AdressenNr=VAUID.KdNr
inner Join kunden On KundenNr=VAUID.KdNr
inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr
where (VAUID.UstIdGeprüft <= '" & datum.ToShortDateString & "' OR VAUID.UstIdGeprüft is null) and (isnull(VAUID.UstIdKz,'') <> '' and isnull(VAUID.UstIdNr,'') <> '') AND Filialen.firma='VERAG' " & where.Replace("Adressen.", "VAUID.")
dt = SQL.loadDgvBySql(SQLUID & " UNION ALL " & SQLUID_Veranlagungskunden & " ORDER BY Ordnungsbegriff", "FMZOLL")
Return dt