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:
d.breimaier
2026-01-13 16:09:18 +01:00
parent eb1f0f7892 283ba40d9c
commit 579af7ef26
16 changed files with 1285 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
VERAG_PROG_ALLGEMEIN/Classes/cGreendeal_CBAM_Trn.vb
View File

@@ -211,6 +211,51 @@ Public Class cGreendeal_CBAM_Trn
End Function
Public Shared Function LoadCBAMTariffNumbers(Optional onlyActive As Boolean = True,
Optional includeExclusions As Boolean = False) _
As List(Of String)
Dim sql As String =
"SELECT DISTINCT trnPattern " &
"FROM VERAG.dbo.tblGreendeal_CBAM_Trn " &
"WHERE trnPattern IS NOT NULL " &
"AND LTRIM(RTRIM(trnPattern)) <> '' "
If onlyActive Then
sql &= " AND is_active = 1 " &
" AND (start_date IS NULL OR start_date <= GETDATE()) " &
" AND (end_date IS NULL OR end_date >= GETDATE()) "
End If
If Not includeExclusions Then
sql &= " AND ISNULL(is_exclusion,0) = 0 "
End If
Dim dt As DataTable =
(New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(sql, "FMZOLL")
Dim result As New List(Of String)
If dt Is Nothing OrElse dt.Rows.Count = 0 Then
Return result
End If
For Each r As DataRow In dt.Rows
Dim pattern As String = r("trnPattern").ToString().Trim()
' % entfernen → reine Tarifnummer
pattern = pattern.Replace("%", "")
' nur numerische Werte zulassen
If pattern <> "" AndAlso pattern.All(AddressOf Char.IsDigit) Then
result.Add(pattern)
End If
Next
Return result.Distinct().OrderBy(Function(x) x).ToList()
End Function
Public Shared Function DELETE_ALL() As Boolean
Try

5
VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb
View File

@@ -321,12 +321,13 @@ Public Class cKunde
' Return Nothing
End Sub
Public Shared Function LOAD_ByEORI(EORI) As cKunde
Public Shared Function LOAD_ByEORI(EORI, Optional searchfirma = "") As cKunde
Dim test = ""
Dim KUNDE As New cKunde()
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM Kunden INNER JOIN Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE EORITIN=@EORITIN and ( '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG") & "' IN (Filialen.Firma,Filialen.Cluster)) ", conn)
If searchfirma = "" Then searchfirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.Replace("ATILLA", "VERAG")
Using cmd As New SqlCommand("SELECT * FROM Kunden INNER JOIN Filialen on Filialen.FilialenNr=Kunden.FilialenNr WHERE EORITIN=@EORITIN and ( '" & searchfirma & "' IN (Filialen.Firma,Filialen.Cluster)) ", conn)
cmd.Parameters.AddWithValue("@EORITIN", EORI)
Dim dr = cmd.ExecuteReader()

14
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -107,6 +107,11 @@ Public Class cKundenErweitert
Property kde_ATEZ_GreenpulseID As Object = Nothing
Property kde_SEG_Summe As Object = Nothing
Property kde_SEG_Datum As Object = Nothing
Property kde_CBAM_Status As String = ""
Property kde_CBAM_Warn1 As Decimal? = 30
Property kde_CBAM_Warn2 As Decimal? = 40
Property kde_CBAM_ApplicationNo As Object = Nothing
Property kde_CBAM_CBAMAccountNo As Object = Nothing
Dim SQL As New SQL
@@ -221,6 +226,15 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Summe", kde_SEG_Summe))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Datum", kde_SEG_Datum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Status", kde_CBAM_Status))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn1", kde_CBAM_Warn1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn2", kde_CBAM_Warn2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_ApplicationNo", kde_CBAM_ApplicationNo))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_CBAMAccountNo", kde_CBAM_CBAMAccountNo))
Return list
End Function

7
VERAG_PROG_ALLGEMEIN/Classes/cKundenVertraege.vb
View File

@@ -6,6 +6,7 @@ Public Class cKundenVertraege
Property kv_Id As Integer
Property kv_KundenNr As Integer
Property kv_erhalten_Datum As Date
Property kv_gueltigBis_Datum As Date?
Property kv_vertragArtId As Integer
Property kv_Info As Object = Nothing
Property kv_datenarchivId As Object = Nothing
@@ -24,10 +25,11 @@ Public Class cKundenVertraege
LOAD()
End Sub
Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId, Optional kv_gueltigBis_Datum = Nothing)
Me.kv_KundenNr = kv_KundenNr
Me.kv_erhalten_Datum = kv_erhalten_Datum
Me.kv_vertragArtId = kv_vertragArtId
Me.kv_gueltigBis_Datum = kv_gueltigBis_Datum
LOAD(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
End Sub
@@ -40,12 +42,13 @@ Public Class cKundenVertraege
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_Info", kv_Info))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_datenarchivId", kv_datenarchivId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltig", kv_gueltig))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_gueltigBis_Datum", kv_gueltigBis_Datum))
Return list
End Function
Public Shared Function LOAD_LIST(KundenNr As Integer) As DataTable
Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig] FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
Return (New SQL).loadDgvBySql("SELECT [kv_Id],[kv_KundenNr],[kv_erhalten_Datum],[kv_vertragArtId],kva_Bezeichnung,[kv_Info],[kv_datenarchivId],[kv_gueltig],kv_gueltigBis_Datum FROM tblKundenVertraege INNER JOIN tblKundenVertraegeArten ON kv_vertragArtId=kva_id WHERE kv_KundenNr=" & KundenNr, "FMZOLL")
End Function
Public Shared Function ENTRY_Exists(KundenNr As Integer, kv_vertragArtId As Integer) As Boolean