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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-05-22 16:15:20 +02:00
parent df1239705a b7f6d8540d
commit a77dd979a7
11 changed files with 386 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -58,6 +58,9 @@ Public Class cAdressen
End If
End Sub
Sub New(UIDNr As String, woellKdNr As Integer)
LOADUIDNr(UIDNr, woellKdNr)
End Sub
Public Function FullName() As String
Return (If(Name_1, "") & " " & If(Name_2, "")).ToString.Replace(" ", " ")
End Function
@@ -297,6 +300,42 @@ Public Class cAdressen
' Return Nothing
End Sub
Public Sub LOADUIDNr(UIDNr As String, woelflKdNr As Integer)
Dim test = ""
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE UstIdKz + UstIdNr='" & UIDNr & "' AND WölflKundenNr = " & woelflKdNr, conn)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
' Try
test = li.Text
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
Me.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
@@ -350,7 +389,7 @@ Public Class cAdressen
End Function
Public Shared Function getNewAdressenNr752000() As Integer
Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1 FROM [Adressen] where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1 FROM [Adressen] where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
End Function
Public Function getInsertCmd() As String

2
VERAG_PROG_ALLGEMEIN/Classes/cERS.vb
View File

@@ -55,7 +55,7 @@ Public Class cERS
Return ERS.SAVE()
Catch ex As Exception
'was soll hier noch helfen??
'was soll hier noch helfen?? :)))
End Try
End Function

85
VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
View File

@@ -23,8 +23,8 @@ Public Class cRMC
Property rmc_version As Object = Nothing
Property rmc_pdfFileName As Object = Nothing
Property rmc_daId As Object = Nothing
Property rmc_archiviertDatum As Boolean = False
Property rmc_archiv As Object = Nothing
Property rmc_archiviertDatum As Object
Property rmc_archiv As Boolean = False
Property rmc_fibuNr As Boolean = False
Property rmc_sammelReNr As Object = Nothing
@@ -36,13 +36,14 @@ Public Class cRMC
End Sub
Sub New(rmc_id)
Me.rmc_id = rmc_id
Sub New(rmc_kdNr, rmc_reNr)
Me.rmc_kdNr = rmc_kdNr
Me.rmc_reNr = rmc_reNr
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("rmc_id", rmc_id,, True))
'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_id", rmc_id))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_kdNr", rmc_kdNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_kdName", rmc_kdName))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("rmc_UID", rmc_UID))
@@ -75,7 +76,7 @@ Public Class cRMC
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblRMCImport WHERE rmc_id=@rmc_id) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblRMCImport WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr and rmc_archiv is null ) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -88,8 +89,9 @@ Public Class cRMC
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblRMCImport WHERE rmc_id=@rmc_id ", conn)
cmd.Parameters.AddWithValue("@rmc_id", rmc_id)
Using cmd As New SqlCommand("SELECT * FROM tblRMCImport WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr", conn)
cmd.Parameters.AddWithValue("@rmc_kdNr", rmc_kdNr)
cmd.Parameters.AddWithValue("@rmc_reNr", rmc_reNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
@@ -125,7 +127,7 @@ Public Class cRMC
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE tblRMCImport SET " & str & " WHERE rmc_id=@rmc_id ")
Return (" UPDATE tblRMCImport SET " & str & " WHERE rmc_kdNr=@rmc_kdNr AND rmc_reNr = @rmc_reNr ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -155,6 +157,67 @@ Public Class cRMC
End Function
Public Shared Function GET_Antraege_RMC(ByRef dt As DataTable, von As Date, bis As Date, KundenNr As Integer, LandKZ As String, Optional Archiv As Object = Nothing) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand(" SELECT rmc_reDatum,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto] FROM [tblRMCImport]
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr]
where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND rmc_landKZ ='" & LandKZ & "'" & If(Archiv, " And rmc_archiv =@Archiv ", "") & "
group by rmc_reDatum,[rmc_reNr],[rmc_waehrung]
having sum([rmc_betragMWST])>0
order by rmc_reDatum", conn)
cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader()
dt.Load(dr)
'While dr.Read
' dt.Load(dr)
'End While
dr.Close()
End Using
End Using
Return True
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("von", von))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr))
Return SQL.doSQLVarList("
UPDATE [tblRMCImport] set rmc_archiv=1, [rmc_archiviertDatum]=GETDATE()
WHERE cast(rmc_reDatum as date) between @von and @bis and rmc_kdNr=@KundenNr
", "FMZOLL",, list)
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public VERARBEITUNG_PFAD
Public ARCHIV_PFAD
Public ERROR_PFAD
@@ -171,9 +234,7 @@ Public Class cRMC
ERROR_PFAD = cRMC.Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ARCHIV_PFAD = cRMC.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
VERARBEITUNG_PFAD = cRMC.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
FTP_PFAD = cRMC.Paramter.GET_PARAM_ByName("SERVER_Path_In", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ZIEL_PFAD = cRMC.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)
Return Paramter.getFTPConenction(API_STRING, API, programName)
@@ -189,7 +250,7 @@ Public Class cRMC
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='RMC' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM))
End Function
Shared Function getFTPConenction(API_String As String, API As DataTable, program As String) As Boolean
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean
API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
If API.Rows.Count = 0 Then