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

merge

Browse Source
This commit is contained in:
m.ilhan
2024-10-10 14:41:18 +02:00
parent 8ce76ed4f6 f9003db09d
commit bda299a576
27 changed files with 463 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb
View File

@@ -117,3 +117,93 @@ Public Class cFremdwaehrungskurse
End Class
Public Class cWaehrungskurseNEU
Property fw_id As String
Property fw_iso2 As String
Property fw_iso3 As String
Property fw_land As String
Property fw_kurswert As Double
Dim SQL As New SQL
Sub New()
End Sub
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("fw_id", fw_id))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_iso2", fw_iso2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_iso3", fw_iso3))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_land", fw_land))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fw_kurswert", fw_kurswert))
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 tblWahrungtabelleNEU WITH(updlock,serializable) WHERE fw_iso2=@fw_iso2 AND fw_land=@fw_land) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
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 [tblWahrungtabelleNEU] SET " & str & " WHERE fw_iso2=@fw_iso2 AND fw_land=@fw_land")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
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 tblWahrungtabelleNEU (" & str & ") VALUES(" & values & ") ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return ""
End Function
End Class

5
VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb
View File

@@ -18,6 +18,9 @@ Public Class cGesamtsicherheitsPositionen
Property gsp_erstellungsdatum As DateTime
Property gsp_isPosRundungsdiff As Boolean
Property gsp_zuletztgeandert As Object = Nothing
Property gsp_systemuser As Object = Nothing
Property gsp_datum As Object = Nothing
Public hasEntry = False
@@ -51,6 +54,8 @@ Public Class cGesamtsicherheitsPositionen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_erstellungsdatum", gsp_erstellungsdatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_datum", gsp_datum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_isPosRundungsdiff", gsp_isPosRundungsdiff))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_systemuser", gsp_systemuser))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_zuletztgeandert", gsp_zuletztgeandert))
Return list

1
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -1557,7 +1557,6 @@ Public Class cFormularManager
End If
End If
'If Not VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() Then MsgBox("Fehler beim Laden der SPIRE-Lizenz")
Using webClient As New Net.WebClient()

6
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
View File

@@ -1,11 +1,5 @@
Imports System.Drawing
Imports System.IO
Imports System.Reflection
Imports System.Security.Policy
Imports System.Threading
Imports System.Web.UI.WebControls.WebParts
Imports System.Windows.Forms
Imports VERAG_PROG_ALLGEMEIN.cMessenger
Public Class frmMessenger
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

3
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
View File

@@ -1,11 +1,8 @@

Imports System.Drawing
Imports System.Globalization
Imports System.Reflection
Imports System.Text
Imports System.Threading
Imports System.Windows.Forms
Imports DocumentFormat.OpenXml.Drawing.Diagrams
Public Class frmUeberstundenauszahlen
Dim refresh As Boolean = False

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/MIC/cMICInterface.vb
View File

@@ -33,8 +33,6 @@ Public Class cMICInterface
Return False 'TEST!
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)

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

@@ -1,9 +1,6 @@
Imports System.Data.SqlClient
Imports System.EnterpriseServices
Imports System.IO
Imports System.Net
Imports System.Reflection
Imports DocumentFormat.OpenXml.InkML
Public Class cMSEAPI
@@ -1016,19 +1013,18 @@ Public Class cMSEAPI
'\\datenarchiv\Datenarchiv\MDM_SCHNITTSTELLEN\ECHTSYSTEM\Nachrichtendaten_ZIEL\MSE
If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices
Dim inv As New cMSEInvoices(r("name"), r("inv.invoice_id"))
If Not inv.imported Then 'verhindert unnötige Downloads
Dim inv As New cMSEInvoices(r("name"), r("invoice_id"))
If IsDBNull(inv.daId) Then 'verhindert unnötige Downloads
Dim filepath = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("url"), r("name"), PDFRECHNUNGENPFAD, False)
If filepath <> "" AndAlso uploadToDs Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "MSE", Now.Year, Now.ToString("yyyyMMdd"), r("name"))
DS.uploadDataToDATENSERVER(filepath & "\" & r("name"),,,,,, True)
SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "', imported = 1 where [name] = '" & r("name") & "'", "FMZOLL")
SQL.doSQL("Update [tblMSEInvoices] SET [daId]='" & DS.da_id & "' where [name] = '" & r("name") & "'", "FMZOLL")
End If
End If
End If
Next
dt = dt.DefaultView.ToTable()
@@ -1041,7 +1037,6 @@ Public Class cMSEAPI
End Function
Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
Dim j As Integer = 0

2
VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
View File

@@ -246,7 +246,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
wb.Worksheets(0).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter
If rangeAsWaehrung IsNot Nothing Then
For Each r As IXLRangeAddress In rangeAsWaehrung
For Each r As String In rangeAsWaehrung
Try
wb.Worksheets(0).Range(r).Style.NumberFormat.SetFormat("###,###,##0.00 €")
Catch ex As Exception

4
VERAG_PROG_ALLGEMEIN/cSicherheiten.vb
View File

@@ -25,6 +25,8 @@ Public Class cSicherheiten
Property gs_avisoId As Integer
Property gs_isRundungsdiff As Boolean
Property gs_ReferenzAenderung As Boolean
Property gs_zuletztgeandert As Object = Nothing
Property gs_systemuser As Object = Nothing
Public hasEntry = False
@@ -69,6 +71,8 @@ Public Class cSicherheiten
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_avisoId", gs_avisoId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_isRundungsdiff", gs_isRundungsdiff))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ReferenzAenderung", gs_ReferenzAenderung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser))
Return list
End Function