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
2025-11-26 09:01:47 +01:00
parent c15c3d0b89 978edb3499
commit 98c47657c2
35 changed files with 4113 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -612,6 +612,26 @@ Public Class cIDS
End Function
Public Shared Function setBackToCustomer(SQL As SQL, backToCustomer As Boolean, ab As Date, AdressenNr As Integer) As Boolean
Return SQL.doSQL("update tblIDSInvoicesNewSplittedByCountry set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where cast(YearMonthDay as Date) >= '" & ab.ToShortDateString & "' AND CustomerCode in (select CustomerCode from tbl_IDS_Kunden where KdNrVERAG = '" & AdressenNr & "' AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 )", "FMZOLL")
End Function
Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, AdressenNr As String) As Boolean
Return SQL.doSQL("update tblIDSInvoicesNewSplittedByCountry set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null AND CustomerCode in (select CustomerCode from tbl_IDS_Kunden where KdNrVERAG = '" & AdressenNr & "' AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 )", "FMZOLL")
End Function
Public Shared Function setBackToCustomerInvoiceID(SQL As SQL, backToCustomer As Boolean, Optional invoiceID As String = "") As Boolean
Return SQL.doSQL("update tblIDSInvoicesNewSplittedByCountry set InvToCustomer = " & IIf(backToCustomer, "1", "0") & " where InvToCustomer Is null " & IIf(invoiceID <> "", "AND invoice_id = '" & invoiceID & "'", " ") & "", "FMZOLL")
End Function
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, ids_kdNr As Integer, country As String, UStVAn_ID As Integer) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

6
VERAG_PROG_ALLGEMEIN/Classes/cKunde.vb
View File

@@ -84,10 +84,7 @@ Public Class cKunde
Property Höchstkredit As Object = Nothing
Property DakosyExport As Object = Nothing
Property FiBuSchnittstelleNr As Object = Nothing
Property Vorlageprovision_Mindestbetrag As Object = Nothing
Public hasEntry As Boolean = False
@@ -191,6 +188,7 @@ Public Class cKunde
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_MSE", UStV_SummeVorschaubetragEUR_MSE))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_UTA", UStV_SummeVorschaubetragEUR_UTA))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_SummeVorschaubetragEUR_IT", UStV_SummeVorschaubetragEUR_IT))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vorlageprovision_Mindestbetrag", Vorlageprovision_Mindestbetrag))
Return list
End Function

2
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -100,6 +100,7 @@ Public Class cKundenErweitert
Property kde_Provisionsverguetung_ProzentDL As Object = Nothing
Property kde_Provisionsverguetung_GSAnKdNr As Object = Nothing
Property kde_zinssatz As Object = Nothing
Property kde_betreuer As Object = Nothing
@@ -207,6 +208,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_zinssatz", kde_zinssatz))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_betreuer", kde_betreuer))
Return list
End Function

123
VERAG_PROG_ALLGEMEIN/Classes/cKundenportal.vb Normal file
View File

@@ -0,0 +1,123 @@

Imports System.Data.SqlClient
Imports System.Reflection
Public Class cKundenportal
Property KundenNr As Object = Nothing
Property Username As Object = Nothing
Property Password As Object = Nothing
Property Lieferant As Object = Nothing
Property Portal As Object = Nothing
Public hasEntry = False
Dim SQL As New SQL
Sub New(KundenNr, Portal)
Me.KundenNr = KundenNr
Me.Portal = Portal
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("Username", Username))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Password", Password))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Lieferant", Lieferant))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Portal", Portal))
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 tblKundenlogin WHERE KundenNr=@KundenNr AND Portal=@Portal ) " &
" 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 tblKundenlogin WHERE KundenNr=@KundenNr AND Portal=@Portal ", conn)
cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
cmd.Parameters.AddWithValue("@Portal", Portal)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
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 [tblKundenlogin] SET " & str & " WHERE KundenNr=@KundenNr AND Portal=@Portal ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
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 tblKundenlogin (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public Shared Function DELETE(KundenNr, Portal) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sqlstr = " DELETE FROM [tblKundenlogin] WITH(updlock,serializable) WHERE KundenNr=" & KundenNr & " AND Portal ='" & Portal & "'"
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
End Class

3
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -102,6 +102,7 @@ Public Class cMitarbeiter
Property mit_Notfall_Handy As Object = Nothing
Property mit_Notfall_Mail As Object = Nothing
Property mit_SchalterID As Object = Nothing
Property mit_Funktion As Object = Nothing
@@ -221,6 +222,7 @@ Public Class cMitarbeiter
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Notfall_Handy", mit_Notfall_Handy))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Notfall_Mail", mit_Notfall_Mail))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_SchalterID", mit_SchalterID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Funktion", mit_Funktion))
@@ -431,6 +433,7 @@ Public Class cMitarbeiter
If Not dr.Item("mit_Notfall_Name") Is DBNull.Value Then Me.mit_Notfall_Name = dr.Item("mit_Notfall_Name")
If Not dr.Item("mit_Notfall_Mail") Is DBNull.Value Then Me.mit_Notfall_Mail = dr.Item("mit_Notfall_Mail")
If Not dr.Item("mit_SchalterID") Is DBNull.Value Then Me.mit_SchalterID = dr.Item("mit_SchalterID")
If Not dr.Item("mit_Funktion") Is DBNull.Value Then Me.mit_Funktion = dr.Item("mit_Funktion")
Catch ex As Exception

25
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

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

Imports System.Data.SqlClient
Imports System.Reflection
Imports System.Web.Configuration
Imports io.konik.zugferd
Public Class cRMC
Property rmc_id As Integer
@@ -255,6 +257,27 @@ Public Class cRMC
End Function
Public Shared Function setBackToCustomer(SQL As SQL, backToCustomer As Boolean, ab As Date, customerNo As Integer) As Boolean
Return SQL.doSQL("update tblRMCImport set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null and cast(rmc_reDatum as Date) >= '" & ab.ToShortDateString & "' AND rmc_kdNr = '" & customerNo & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNo As String) As Boolean
Return SQL.doSQL("update tblRMCImport set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null AND rmc_kdNr = '" & customerNo & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerInvoiceID(SQL As SQL, backToCustomer As Boolean, Optional invoiceID As String = "") As Boolean
Return SQL.doSQL("update tblRMCImport set InvToCustomer = " & IIf(backToCustomer, "1", "0") & " where InvToCustomer Is null " & IIf(invoiceID <> "", "AND rmc_id = '" & invoiceID & "'", " ") & "", "FMZOLL")
End Function
Public Class Paramter
Shared apiSettingsloaded As Boolean = False
@@ -262,7 +285,7 @@ Public Class cRMC
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='RMC' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
End Function
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean

4
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
View File

@@ -122,6 +122,9 @@ Public Class cRechnungsausgang
Property Rechnungsart As String = "RG" ' RG=Rechnung; RU=Rechnung Unvollständig; RK=RechnungKopf -> bei unvollständiger Rechnung ein Kopf benötigt (zB Staffelabrechnung)
Property Vorlageprovision_Mindestbetrag As Object = Nothing
' FROM [VERAG as object=nothing.[dbo as object=nothing.[Rechnungsausgang as object=nothing
Public POSITIONEN As New List(Of cRechnungsausgangPositionen)
@@ -365,6 +368,7 @@ Public Class cRechnungsausgang
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ForceSteuerschlüssel", ForceSteuerschlüssel))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Automailversand", Automailversand))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rechnungsart", Rechnungsart))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vorlageprovision_Mindestbetrag", Vorlageprovision_Mindestbetrag))
Return list
End Function

28
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -1,10 +1,7 @@
Imports System
Imports System.Collections.Generic
Imports System.Data.SqlClient
Imports System.Data.SqlClient
Imports System.IO
Imports System.Reflection
Imports Therefore.API
Imports VERAG_PROG_ALLGEMEIN
Imports System.Web.Configuration
Public Class cUTA
@@ -23,6 +20,27 @@ Public Class cUTA
End Function
Public Shared Function setBackToCustomer(SQL As SQL, backToCustomer As Boolean, ab As Date, customerNo As Integer) As Boolean
Return SQL.doSQL("update tblUTAImportNew set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where cast(Rechnungsdatum as Date) >= '" & ab.ToShortDateString & "' AND Kundennummer = '" & customerNo & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNo As String) As Boolean
Return SQL.doSQL("update tblUTAImportNew set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null AND Kundennummer = '" & customerNo & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerInvoiceID(SQL As SQL, backToCustomer As Boolean, Optional invoiceID As String = "") As Boolean
Return SQL.doSQL("update tblUTAImportNew set InvToCustomer = " & IIf(backToCustomer, "1", "0") & " where InvToCustomer Is null " & IIf(invoiceID <> "", "AND [Rechnungsnummer_pro_Lieferland] = '" & invoiceID & "'", " ") & "", "FMZOLL")
End Function
Public Class UTAHeader
Property Übertragungsnummer As Integer

6
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
View File

@@ -408,14 +408,14 @@ Public Class frmUeberstundenauszahlen
Next
If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then
If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla :
' If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : Laut ANDREAS mit 25.11.2025 wieder deaktiviert!!!!!!!!!!!! -> VILDAN soll hier direkt mit Andreas sprechen
picDel.Visible = True
Button1.Enabled = False
txtAusz.Enabled = False
picShow.Visible = True
Else
sonderRegelungAtilla:
Button1.Enabled = True
'sonderRegelungAtilla: Laut ANDREAS mit 25.11.2025 wieder deaktiviert!!!!!!!!!!!! -> VILDAN soll hier direkt mit Andreas sprechen
Button1.Enabled = True
txtAusz.Enabled = True
picShow.Visible = False

24
VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
View File

@@ -1,6 +1,7 @@
Imports System.Data.SqlClient
Imports System.Net
Imports System.Reflection
Imports System.Web.Configuration
Imports javax
Public Class cMSEAPI
@@ -46,6 +47,29 @@ Public Class cMSEAPI
End Function
Public Shared Function setBackToCustomer(SQL As SQL, backToCustomer As Boolean, ab As Date, customerNr As Integer) As Boolean
Return SQL.doSQL("update tblMSEInvoices set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where cast(invoice_date as Date) >= '" & ab.ToShortDateString & "' AND customer_number = '" & customerNr & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNr As String) As Boolean
Return SQL.doSQL("update tblMSEInvoices set InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & " where InvToCustomer Is null AND customer_number = '" & customerNr & "'", "FMZOLL")
End Function
Public Shared Function setBackToCustomerInvoiceID(SQL As SQL, backToCustomer As Boolean, Optional invoiceID As String = "", Optional customerNr As String = "") As Boolean
Return SQL.doSQL("update tblMSEInvoices set InvToCustomer = " & IIf(backToCustomer, "1", "0") & " where InvToCustomer Is null " & IIf(invoiceID <> "", "AND invoice_id = '" & invoiceID & "' AND customer_number = '" & customerNr & "'", " ") & "", "FMZOLL")
End Function
Public Function createJWT(ByRef failureText As String) As String
Try

1
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -394,6 +394,7 @@
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
<Compile Include="Classes\cMDMEInarbeitung.vb" />
<Compile Include="Classes\cMDMZinsberechnung.vb" />
<Compile Include="Classes\cKundenportal.vb" />
<Compile Include="frmTimasabfrage.Designer.vb">
<DependentUpon>frmTimasabfrage.vb</DependentUpon>
</Compile>