Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb

@@ -28,6 +28,7 @@ Public Class cFirmen
     Property Firma_E_Mail_Mahnungen As Object = Nothing
     Property Firma_Webadresse As Object = Nothing '      NVARCHAR (40)   NULL,
     Property Firma_LandKz As Object = Nothing '      NVARCHAR (40)   NULL,
+    Property Firma_Steuernummer As Object = Nothing
 
     Property Firmengruppe As Object = Nothing
 
@@ -72,6 +73,7 @@ Public Class cFirmen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Webadresse", Firma_Webadresse))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firmengruppe", Firmengruppe))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Steuernummer", Firma_Steuernummer))
 
 
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb

@@ -831,6 +831,130 @@ Public Class cUTA
 
     End Class
 
+
+    Public Class UTADocuments
+
+        Property Id As Integer
+        Property DocumentName As String
+        Property DocumentTyp As String
+        Property Zeitstempel As DateTime
+        Property daId As Integer
+        Property KundenNr As Integer
+        Property RechnungsNr As String
+        Property Datum As Object = Nothing
+
+        Public hasEntry = False
+
+        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+        Sub New(Id)
+            Me.Id = Id
+            LOAD()
+        End Sub
+
+        Sub New()
+        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("Id", Id,, True))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocumentName", DocumentName))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DocumentTyp", DocumentTyp))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zeitstempel", Zeitstempel))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RechnungsNr", RechnungsNr))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Datum", Datum))
+            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 tblUTADocuments  WHERE Datum=@Datum AND KundenNr = @KundenNr AND RechnungsNr=@RechnungsNr ) " &
+                       " 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 tblUTADocuments WHERE Id=@Id ", conn)
+                        cmd.Parameters.AddWithValue("@Id", Id)
+                        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.MethodBase.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 tblUTADocuments SET " & str & " WHERE Datum=@Datum AND KundenNr = @KundenNr AND RechnungsNr=@RechnungsNr")
+
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.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 tblUTADocuments  (" & str & ") VALUES(" & values & ")  ")
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name)
+            End Try
+            Return ""
+        End Function
+
+
+
+    End Class
+
+
     Public Function readAndSaveUTA(objFileRead As StreamReader, fi As FileInfo, cnt As Integer, Optional onlyTestkunedn As Boolean = False) As Boolean
 
 

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -270,11 +270,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
             If autoAdjust Then
 
                 'Spaltenbreite auto:
-                wb.Worksheets(0).Columns().AdjustToContents()
+                If wb.Worksheets(0).ColumnCount > 0 Then wb.Worksheets(0).Columns().AdjustToContents()
 
             End If
 
-            Dim filename As String = ""
+                Dim filename As String = ""
             If optFileName <> "" Then
                 filename = sPath & optFileName & endung '".xlsx"
                 While System.IO.File.Exists(filename)