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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2021-11-19 14:45:28 +01:00
parent f4813a04a9
commit 50df683d3b
85 changed files with 10521 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
View File

@@ -154,6 +154,22 @@ Public Class SQL
Return Nothing
End Function
Public Shared Function GetNewOpenConnectionSYSKA(Optional pooling As Boolean = True) As SqlConnection
Dim cn As New SqlConnection()
Try
cn.ConnectionString = GetSYSKAConnectionString() & IIf(pooling, "", ";pooling=false")
cn.Open()
Return cn
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return Nothing
End Function
Public Shared Function GetSYSKAConnectionString() As String
Return My.MySettings.Default.SYSKAConnectionString
End Function
Public Shared Function GetNewOpenConnectionUID(Optional pooling As Boolean = True) As SqlConnection
Dim cn As New SqlConnection()
'cn.ConnectionString = My.Resources.connStringSDL_DEV
@@ -410,6 +426,7 @@ Public Class SQL
Case "VERAG" : conn = GetNewOpenConnectionFMZOLL()
Case "FD" : conn = GetNewOpenConnectionFD()
Case "WEB" : conn = GetNewOpenConnectionWEB()
Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()
Case "AVISO_ATILLA"
conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"
@@ -640,6 +657,7 @@ Public Class SQL
Case "VERAG" : conn = GetNewOpenConnectionFMZOLL()
Case "DISPO" : conn = GetNewOpenConnectionDISPO()
Case "WEB" : conn = GetNewOpenConnectionWEB()
Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()
Case "AVISO_ATILLA"
conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"

3
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -65,8 +65,7 @@ Public Class cAdressen
Public Shared Function getHoechsteKdNr(NrKr_von As Integer, NrKr_bis As Integer) As Integer
Try
Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ") as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr]) AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ") as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b INNER JOIN Kunden k2 ON k2.Kundennr=b.adressennr where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr]) AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
'Using cmd As New SqlCommand("SELECT isnull(max([AdressenNr])," & NrKr_von & ") as AdressenNr FROM Adressen WHERE AdressenNr BETWEEN '" & NrKr_von & "' AND '" & NrKr_bis & "' ", conn)
Dim dr = cmd.ExecuteReader()
If dr.HasRows Then

4
VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb
View File

@@ -5,8 +5,8 @@ Public Class cNCTS_TR
Property ncts_Id As Integer
Property ncts_Partnersystem As Object = Nothing 'DAKOSY_Worker.cDY_Statusliste.S_00
Property ncts_Status As Object = Nothing ' DAKOSY_Worker.cDY_Statusliste.S_00
Property ncts_Status_KEWILL_Equivalent As Object = Nothing 'DAKOSY_Worker.cDY_Statusliste.S_00
Property ncts_Status As Object = 0
Property ncts_Status_KEWILL_Equivalent As Object = 0 'DAKOSY_Worker.cDY_Statusliste.S_00
Property ncts_dyaArt As String = ""
Property ncts_dyaAnmID As Integer

10
VERAG_PROG_ALLGEMEIN/Classes/cOffene_Posten.vb
View File

@@ -42,7 +42,8 @@ Public Class cOffene_Posten
Public 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("OP_ID", OP_ID, , True, True))
' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OP_ID", OP_ID, , True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OP_ID", OP_ID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kontonummer", Kontonummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kontoname", Kontoname))
@@ -88,6 +89,13 @@ Public Class cOffene_Posten
End Function
Public Function INSERT() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
OP_ID = SQL.doSQLVarListID(OP_ID, getInsertCmd(), "FMZOLL", , list)
Return OP_ID > 0
End Function
Public Sub LOAD()
Try

20
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
View File

@@ -110,6 +110,7 @@ Public Class cRechnungsausgang
Property Grenze As Object = Nothing
Property RechnungSprache As Object = Nothing
Property FakturierungsGruppe As String = ""
Property TextZZ As Object = Nothing
' FROM [VERAG as object=nothing.[dbo as object=nothing.[Rechnungsausgang as object=nothing
@@ -124,7 +125,7 @@ Public Class cRechnungsausgang
Sub New(RK_ID)
Me.RK_ID = RK_ID
LOAD() : LOAD_POSITIONEN()
LOAD() : LOAD_POSITIONEN() : LOAD_ANHAENGE()
End Sub
Sub New(FilialenNr, AbfertigungsNr)
@@ -336,6 +337,7 @@ Public Class cRechnungsausgang
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Grenze", Grenze))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungSprache", RechnungSprache))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FakturierungsGruppe", FakturierungsGruppe))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TextZZ", TextZZ))
Return list
End Function
@@ -404,7 +406,7 @@ Public Class cRechnungsausgang
Public Function SAVE(Optional saveAll As Boolean = True) As Boolean
doVorzeichen()
doVorzeichen() ' Für GS in Minusbeträge umwandeln
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Rechnungsausgang WHERE RK_ID=@RK_ID) " &
" BEGIN " & getUpdateCmd() & " END " &
@@ -416,12 +418,14 @@ Public Class cRechnungsausgang
If RK_ID > 0 Then
doVorzeichenPOS()
doVorzeichenPOS() ' Für GS in Minusbeträge umwandeln
If saveAll Then SAVE_POSITIONEN(RK_ID) ' positionen speicehrn
doVorzeichenPOS() ' Minusbeträge bei GS zurückumwandeln
If saveAll Then SAVE_ANHAENGE(RK_ID) ' positionen speicehrn
doVorzeichenPOS()
End If
doVorzeichen()
doVorzeichen() ' Minusbeträge bei GS zurückumwandeln
Return RK_ID > 0
End Function
@@ -615,7 +619,8 @@ Public Class cRechnungsausgang
dr.Close()
End Using
End Using
doVorzeichenPOS()
doVorzeichenPOS() ' Minus in Plus umwandeln (DB hat Minus, System hat Plus-Beträge)
Catch ex As Exception
MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
@@ -644,7 +649,6 @@ Public Class cRechnungsausgang
dr.Close()
End Using
End Using
doVorzeichenPOS()
Catch ex As Exception
MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
@@ -686,7 +690,7 @@ Public Class cRechnungsausgang
Catch ex As Exception
'Preis null??
End Try
POSITIONEN = POSITIONEN.OrderBy(Function(x) x.LeistungsNr).ToList()
POSITIONEN = POSITIONEN.OrderBy(Function(x) CInt(x.LeistungsNr)).ToList()
Catch ex As Exception
MsgBox("Fehler In der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)

34
VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
View File

@@ -264,6 +264,11 @@ Public Class cSendungen
Return SQL.doSQL(sqlstr, "AVISO")
End Function
Public Function SET_VGMA() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " UPDATE [tblSendungen] SET tblSnd_VG_MA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "', LetzterMitarbeiterId='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "', LetzterMitarbeiter='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "' WHERE tblSnd_SendungID=" & Me.tblSnd_SendungID
Return SQL.doSQL(sqlstr, "AVISO")
End Function
Public Shared Function LOADByFilialenNrAbfertigungsNr(FilialenNr As Integer, AbfertigungsNr As Integer) As cSendungen
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim tblSnd_SendungID = sql.getValueTxtBySql("SELECT TOP 1 tblSnd_SendungID FROM tblSendungen WHERE FilialenNr='" & FilialenNr & "' AND AbfertigungsNr='" & AbfertigungsNr & "'", "AVISO")
@@ -274,6 +279,35 @@ Public Class cSendungen
End If
End Function
Public Function getKdAtrNr(art As String) As String
Try
' If SND Is Nothing Then Return ""
Dim KdNR = -1
Dim KdAtrNr = Nothing
Select Case art
Case "EMPFAENGER" : KdAtrNr = Me.tblSnd_KdAuftragsNrEmpfaenger : KdNR = Me.tblSnd_EmpfaengerKdNr
Case "AUFTRAGGEBER" : KdAtrNr = Me.tblSnd_KdAuftragsNr : KdNR = Me.tblSnd_AuftraggeberKdNr
Case "FRAECHTER" : KdAtrNr = Me.tblSnd_KdAuftragsNrFrachtfuehrer : KdNR = Me.tblSnd_FrachtfuehrerKdNr
Case "AVISIERER" : KdAtrNr = Me.tblSnd_KdAuftragsNrAvisierer : KdNR = Me.tblSnd_AvisiererKdNr
End Select
If If(KdAtrNr, "").Trim <> String.Empty Then
Return KdAtrNr
Else
If Me.tblSnd_EmpfaengerKdNr = KdNR And If(Me.tblSnd_KdAuftragsNrEmpfaenger, "").Trim <> String.Empty Then Return Me.tblSnd_KdAuftragsNrEmpfaenger
If Me.tblSnd_AuftraggeberKdNr = KdNR And If(Me.tblSnd_KdAuftragsNr, "").Trim <> String.Empty Then Return Me.tblSnd_KdAuftragsNr
If Me.tblSnd_FrachtfuehrerKdNr = KdNR And If(Me.tblSnd_KdAuftragsNrFrachtfuehrer, "").Trim <> String.Empty Then Return Me.tblSnd_KdAuftragsNrFrachtfuehrer
If Me.tblSnd_AvisiererKdNr = KdNR And If(Me.tblSnd_KdAuftragsNrAvisierer, "").Trim <> String.Empty Then Return Me.tblSnd_KdAuftragsNrAvisierer
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & " 'cSENDUNGEN ATRNR '", System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ""
End Function
Public Sub LOAD(tblSnd_SendungID As Integer)
Try
Dim conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()

2
VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
View File

@@ -332,7 +332,7 @@ Class TrdInvoice_FUNCTIONS
Dim WährungsdifferenzSteuerpflichtigerBetrag As Double
Dim WährungsdifferenzSteuerfreierBetrag As Integer
Dim dt As DataTable = SQL.loadDgvBySql(getSQLString_SELECTForTrdInvoice(Firma), "FMZOLL", 2400)
Dim dt As DataTable = SQL.loadDgvBySql(getSQLString_SELECTForTrdInvoice(Firma), "FMZOLL", 9800)
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
For Each ROW In dt.Rows
Dim TRD_INVOICE As New VERAG_PROG_ALLGEMEIN.cTrdInvoice(ROW("RK_RechnungsDatum"), ROW("RK_RechnungsNr"))