essensbestellungen, etc.

2026-09-08 14:16:16 +02:00
parent f70bdbbf71
commit f71f799e3e
18 changed files with 1476 additions and 94 deletions
--- a/SDL/buchhaltung/usrCntlBH.Designer.vb
+++ b/SDL/buchhaltung/usrCntlBH.Designer.vb
@@ -76,6 +76,9 @@ Partial Class usrCntlBH
        Me.Label1 = New System.Windows.Forms.Label()
        Me.btnWord = New System.Windows.Forms.Button()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.cboFirma_FIBUFilialen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label67 = New System.Windows.Forms.Label()
+        Me.Button16 = New System.Windows.Forms.Button()
        Me.txtMonateSyskavergleich = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label61 = New System.Windows.Forms.Label()
        Me.Button15 = New System.Windows.Forms.Button()
@@ -166,6 +169,11 @@ Partial Class usrCntlBH
        Me.btn_Erloeskkonten = New System.Windows.Forms.Button()
        Me.Label62 = New System.Windows.Forms.Label()
        Me.GroupBox11 = New System.Windows.Forms.GroupBox()
+        Me.txtPloseAnh_Einarbeitung = New System.Windows.Forms.TextBox()
+        Me.Label71 = New System.Windows.Forms.Label()
+        Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar()
+        Me.lblPloseAnh_Proz = New System.Windows.Forms.Label()
+        Me.cbxZBalsSR = New System.Windows.Forms.CheckBox()
        Me.Label57 = New System.Windows.Forms.Label()
        Me.btnDel_ = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnWikiStatusmails = New System.Windows.Forms.Button()
@@ -190,9 +198,7 @@ Partial Class usrCntlBH
        Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label51 = New System.Windows.Forms.Label()
        Me.txtJahr_FIBU = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Button16 = New System.Windows.Forms.Button()
-        Me.Label67 = New System.Windows.Forms.Label()
-        Me.cboFirma_FIBUFilialen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button17 = New System.Windows.Forms.Button()
        Me.pnl.SuspendLayout()
        Me.TabPage1.SuspendLayout()
        Me.GroupBox13.SuspendLayout()
@@ -906,6 +912,41 @@ Partial Class usrCntlBH
        Me.GroupBox2.TabIndex = 4
        Me.GroupBox2.TabStop = False
        '
+        'cboFirma_FIBUFilialen
+        '
+        Me.cboFirma_FIBUFilialen._allowedValuesFreiText = Nothing
+        Me.cboFirma_FIBUFilialen._allowFreiText = False
+        Me.cboFirma_FIBUFilialen._value = ""
+        Me.cboFirma_FIBUFilialen.DropDownWidth = 150
+        Me.cboFirma_FIBUFilialen.FormattingEnabled = True
+        Me.cboFirma_FIBUFilialen.Location = New System.Drawing.Point(406, 57)
+        Me.cboFirma_FIBUFilialen.Name = "cboFirma_FIBUFilialen"
+        Me.cboFirma_FIBUFilialen.Size = New System.Drawing.Size(54, 21)
+        Me.cboFirma_FIBUFilialen.TabIndex = 43
+        '
+        'Label67
+        '
+        Me.Label67.AutoSize = True
+        Me.Label67.Location = New System.Drawing.Point(145, 87)
+        Me.Label67.Name = "Label67"
+        Me.Label67.Size = New System.Drawing.Size(105, 13)
+        Me.Label67.TabIndex = 45
+        Me.Label67.Text = "Vergleich UID-Syska"
+        '
+        'Button16
+        '
+        Me.Button16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+        Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button16.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button16.Location = New System.Drawing.Point(6, 81)
+        Me.Button16.Name = "Button16"
+        Me.Button16.Size = New System.Drawing.Size(121, 23)
+        Me.Button16.TabIndex = 44
+        Me.Button16.Text = "          Excel"
+        Me.Button16.UseVisualStyleBackColor = True
+        '
        'txtMonateSyskavergleich
        '
        Me.txtMonateSyskavergleich._DateTimeOnly = False
@@ -1949,6 +1990,7 @@ Partial Class usrCntlBH
        '
        'GroupBox14
        '
+        Me.GroupBox14.Controls.Add(Me.Button17)
        Me.GroupBox14.Controls.Add(Me.Label63)
        Me.GroupBox14.Controls.Add(Me.Label66)
        Me.GroupBox14.Controls.Add(Me.txtLand)
@@ -1959,7 +2001,7 @@ Partial Class usrCntlBH
        Me.GroupBox14.Controls.Add(Me.btn_ZV)
        Me.GroupBox14.Controls.Add(Me.btn_Laender)
        Me.GroupBox14.Controls.Add(Me.btn_Erloeskkonten)
-        Me.GroupBox14.Location = New System.Drawing.Point(20, 153)
+        Me.GroupBox14.Location = New System.Drawing.Point(14, 227)
        Me.GroupBox14.Name = "GroupBox14"
        Me.GroupBox14.Size = New System.Drawing.Size(841, 123)
        Me.GroupBox14.TabIndex = 38
@@ -2115,7 +2157,7 @@ Partial Class usrCntlBH
        Me.Label62.AutoSize = True
        Me.Label62.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label62.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.Label62.Location = New System.Drawing.Point(17, 133)
+        Me.Label62.Location = New System.Drawing.Point(11, 207)
        Me.Label62.Name = "Label62"
        Me.Label62.Size = New System.Drawing.Size(145, 17)
        Me.Label62.TabIndex = 37
@@ -2123,6 +2165,11 @@ Partial Class usrCntlBH
        '
        'GroupBox11
        '
+        Me.GroupBox11.Controls.Add(Me.txtPloseAnh_Einarbeitung)
+        Me.GroupBox11.Controls.Add(Me.Label71)
+        Me.GroupBox11.Controls.Add(Me.pbPloseAnh_Proz)
+        Me.GroupBox11.Controls.Add(Me.lblPloseAnh_Proz)
+        Me.GroupBox11.Controls.Add(Me.cbxZBalsSR)
        Me.GroupBox11.Controls.Add(Me.Label57)
        Me.GroupBox11.Controls.Add(Me.btnDel_)
        Me.GroupBox11.Controls.Add(Me.btnWikiStatusmails)
@@ -2147,10 +2194,57 @@ Partial Class usrCntlBH
        Me.GroupBox11.Controls.Add(Me.txtZRbis)
        Me.GroupBox11.Location = New System.Drawing.Point(14, 30)
        Me.GroupBox11.Name = "GroupBox11"
-        Me.GroupBox11.Size = New System.Drawing.Size(847, 88)
+        Me.GroupBox11.Size = New System.Drawing.Size(847, 149)
        Me.GroupBox11.TabIndex = 36
        Me.GroupBox11.TabStop = False
        '
+        'txtPloseAnh_Einarbeitung
+        '
+        Me.txtPloseAnh_Einarbeitung.BackColor = System.Drawing.Color.White
+        Me.txtPloseAnh_Einarbeitung.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtPloseAnh_Einarbeitung.Location = New System.Drawing.Point(80, 121)
+        Me.txtPloseAnh_Einarbeitung.Name = "txtPloseAnh_Einarbeitung"
+        Me.txtPloseAnh_Einarbeitung.Size = New System.Drawing.Size(106, 13)
+        Me.txtPloseAnh_Einarbeitung.TabIndex = 80
+        '
+        'Label71
+        '
+        Me.Label71.AutoSize = True
+        Me.Label71.Location = New System.Drawing.Point(13, 121)
+        Me.Label71.Name = "Label71"
+        Me.Label71.Size = New System.Drawing.Size(56, 13)
+        Me.Label71.TabIndex = 77
+        Me.Label71.Text = "Fortschritt:"
+        '
+        'pbPloseAnh_Proz
+        '
+        Me.pbPloseAnh_Proz.Location = New System.Drawing.Point(16, 92)
+        Me.pbPloseAnh_Proz.Name = "pbPloseAnh_Proz"
+        Me.pbPloseAnh_Proz.Size = New System.Drawing.Size(245, 23)
+        Me.pbPloseAnh_Proz.TabIndex = 78
+        '
+        'lblPloseAnh_Proz
+        '
+        Me.lblPloseAnh_Proz.Location = New System.Drawing.Point(192, 121)
+        Me.lblPloseAnh_Proz.Name = "lblPloseAnh_Proz"
+        Me.lblPloseAnh_Proz.Size = New System.Drawing.Size(69, 13)
+        Me.lblPloseAnh_Proz.TabIndex = 79
+        Me.lblPloseAnh_Proz.Text = "0%"
+        Me.lblPloseAnh_Proz.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'cbxZBalsSR
+        '
+        Me.cbxZBalsSR.AutoSize = True
+        Me.cbxZBalsSR.Checked = True
+        Me.cbxZBalsSR.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxZBalsSR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxZBalsSR.Location = New System.Drawing.Point(524, 67)
+        Me.cbxZBalsSR.Name = "cbxZBalsSR"
+        Me.cbxZBalsSR.Size = New System.Drawing.Size(177, 17)
+        Me.cbxZBalsSR.TabIndex = 76
+        Me.cbxZBalsSR.Text = "als Sammelrechnung fakturieren"
+        Me.cbxZBalsSR.UseVisualStyleBackColor = True
+        '
        'Label57
        '
        Me.Label57.AutoSize = True
@@ -2519,7 +2613,7 @@ Partial Class usrCntlBH
        Me.txtJahr_FIBU._Waehrung = False
        Me.txtJahr_FIBU._WaehrungZeichen = True
        Me.txtJahr_FIBU.ForeColor = System.Drawing.Color.Black
-        Me.txtJahr_FIBU.Location = New System.Drawing.Point(175, 133)
+        Me.txtJahr_FIBU.Location = New System.Drawing.Point(169, 207)
        Me.txtJahr_FIBU.MaxLineLength = -1
        Me.txtJahr_FIBU.MaxLines_Warning = ""
        Me.txtJahr_FIBU.MaxLines_Warning_Label = Nothing
@@ -2528,40 +2622,17 @@ Partial Class usrCntlBH
        Me.txtJahr_FIBU.TabIndex = 76
        Me.txtJahr_FIBU.Text = "0"
        '
-        'Button16
+        'Button17
        '
-        Me.Button16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button16.Image = Global.SDL.My.Resources.Resources.Excel_logo
-        Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button16.Location = New System.Drawing.Point(6, 81)
-        Me.Button16.Name = "Button16"
-        Me.Button16.Size = New System.Drawing.Size(121, 23)
-        Me.Button16.TabIndex = 44
-        Me.Button16.Text = "          Excel"
-        Me.Button16.UseVisualStyleBackColor = True
-        '
-        'Label67
-        '
-        Me.Label67.AutoSize = True
-        Me.Label67.Location = New System.Drawing.Point(145, 87)
-        Me.Label67.Name = "Label67"
-        Me.Label67.Size = New System.Drawing.Size(105, 13)
-        Me.Label67.TabIndex = 45
-        Me.Label67.Text = "Vergleich UID-Syska"
-        '
-        'cboFirma_FIBUFilialen
-        '
-        Me.cboFirma_FIBUFilialen._allowedValuesFreiText = Nothing
-        Me.cboFirma_FIBUFilialen._allowFreiText = False
-        Me.cboFirma_FIBUFilialen._value = ""
-        Me.cboFirma_FIBUFilialen.DropDownWidth = 150
-        Me.cboFirma_FIBUFilialen.FormattingEnabled = True
-        Me.cboFirma_FIBUFilialen.Location = New System.Drawing.Point(406, 57)
-        Me.cboFirma_FIBUFilialen.Name = "cboFirma_FIBUFilialen"
-        Me.cboFirma_FIBUFilialen.Size = New System.Drawing.Size(54, 21)
-        Me.cboFirma_FIBUFilialen.TabIndex = 43
+        Me.Button17.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
+        Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.Button17.FlatAppearance.BorderSize = 0
+        Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button17.Location = New System.Drawing.Point(816, 19)
+        Me.Button17.Name = "Button17"
+        Me.Button17.Size = New System.Drawing.Size(25, 20)
+        Me.Button17.TabIndex = 81
+        Me.Button17.UseVisualStyleBackColor = True
        '
        'usrCntlBH
        '
@@ -2788,4 +2859,10 @@ Partial Class usrCntlBH
    Friend WithEvents cboFirma_FIBUFilialen As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label67 As Label
    Friend WithEvents Button16 As Button
+    Friend WithEvents cbxZBalsSR As CheckBox
+    Friend WithEvents txtPloseAnh_Einarbeitung As TextBox
+    Friend WithEvents Label71 As Label
+    Friend WithEvents pbPloseAnh_Proz As ProgressBar
+    Friend WithEvents lblPloseAnh_Proz As Label
+    Friend WithEvents Button17 As Button
 End Class
--- a/SDL/buchhaltung/usrCntlBH.vb
+++ b/SDL/buchhaltung/usrCntlBH.vb
@@ -1,7 +1,9 @@
 Imports System.Globalization
 Imports System.Text
 Imports ClosedXML.Excel
+Imports com.sun.xml.internal.rngom
 Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON

 Public Class usrCntlBH
    Dim GrenzeVersicherung = 50000
@@ -901,6 +903,7 @@ Public Class usrCntlBH
            Else

                Dim counter As Integer = 0
+                Dim cnt As Integer = 0

                For Each r As DataRow In dt.Rows

@@ -936,6 +939,15 @@ Public Class usrCntlBH
                        End If
                    End If

+                    txtPloseAnh_Einarbeitung.Text = cnt & " / " & dt.Rows.Count
+                    Dim proz As Double = (cnt / dt.Rows.Count) * 100
+                    pbPloseAnh_Proz.Value = proz
+                    lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
+                    'GroupBox12.Refresh()
+                    My.Application.DoEvents()
+
+                    cnt += 1
+

                Next

@@ -987,6 +999,10 @@ Public Class usrCntlBH
            End If


+            pbPloseAnh_Proz.Value = 100
+            txtPloseAnh_Einarbeitung.Text = dt.Rows.Count & " / " & dt.Rows.Count
+            lblPloseAnh_Proz.Text = "100.00 %"
+


        End If
@@ -1042,7 +1058,7 @@ Public Class usrCntlBH

    End Function

-    Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef Fusstext As String, ZahlungszielAusDebitor As Integer)
+    Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef Fusstext As String, ZahlungszielAusDebitor As Integer, sammelrechnung As Boolean)
        Try

            If KdNr = "" Then Return False
@@ -1055,7 +1071,7 @@ Public Class usrCntlBH
            Dim Abfertigungsart As Integer

            'TODO. Setzen!
-            OffertenNr = 95 : Abfertigungsart = 10 : RG.Anlage_1 = ""
+            OffertenNr = 95 : Abfertigungsart = 10

            RG.Firma_ID = 19

@@ -1067,7 +1083,13 @@ Public Class usrCntlBH
            RG.Buchungsjahr = cRKSV.getGJ(SPEDBUCH.Abfertigungsdatum, RG.Firma_ID) 'If(Now.Month = 1, Now.Year - 1, Now.Year)
            RG.FilialenNr = SPEDBUCH.FilialenNr
            RG.Abfertigungsdatum = SPEDBUCH.Abfertigungsdatum
-            RG.Sammelrechnung = 0
+
+            If sammelrechnung Then
+                RG.Sammelrechnung = 6
+            Else
+                RG.Sammelrechnung = 0
+            End If
+
            RG.BelegartenKz = "AR"
            RG.BelegartenNr = 70
            RG.BelegartenBez = "Rechnung"
@@ -1180,6 +1202,7 @@ Public Class usrCntlBH

            RG.Text = (cFakturierung.przRechnungstextTXT(RG, SPEDBUCH) & vbNewLine & cFakturierung.przRechnungstextZZ(RG)).Trim

+
            If RG.SAVE Then
                RK_ID = RG.RK_ID
                Return True
@@ -1238,6 +1261,8 @@ Public Class usrCntlBH
        Return False
    End Function

+
+
    Private Sub Button13_Click_1(sender As Object, e As EventArgs) Handles Button13.Click
        Dim frm As New frmZinsnachberechnung("tblMDM_Zinsberechnung", "FMZOLL")
        frm.ShowDialog(Me)
@@ -1330,7 +1355,7 @@ Public Class usrCntlBH

            If vbYes = MsgBox("Möchten Sie für " & dt_Main.Rows.Count & " Kunden die Zinsbelastung mit Abrechnungsdatum " & CDate(txtZRbis.Text).ToShortDateString & " verrechnen?" & vbNewLine & "Es werden nur Rechnungen erstellt, deren Gesamtbelastung über " & LimitBEtrag & " EUR liegt!", vbYesNoCancel) Then

-
+                Dim cnt As Integer = 0

                For Each R In dt_Main.Rows

@@ -1353,18 +1378,31 @@ Public Class usrCntlBH
                    Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
                    Dim RK_ID As Integer = -1
                    If Not gen_SPEDBUCH_ByKdNr(R("kundenNr"), SPEDBUCH, CDate(txtZRbis.Text).ToShortDateString, vermerk) Then verarbOK = False
-                    If Not gen_RECHNUNG_BySPEDBUCH(R("kundenNr"), SPEDBUCH, RK_ID, Fußtext, R("belegZahlungsziel")) Then verarbOK = False
+                    If Not gen_RECHNUNG_BySPEDBUCH(R("kundenNr"), SPEDBUCH, RK_ID, Fußtext, R("belegZahlungsziel"), cbxZBalsSR.Checked) Then verarbOK = False

                    If verarbOK Then
                        SQL.doSQL("UPDATE [tblMDM_Zinsberechnung] SET [verrechnet]=GETDATE(), RK_ID = " & RK_ID & " WHERE [verrechnet] Is null And kundenNr='" & R("kundenNr") & "'  ", "FMZOLL")
                    End If

+                    txtPloseAnh_Einarbeitung.Text = cnt & " / " & dt_Main.Rows.Count
+                    Dim proz As Double = (cnt / dt_Main.Rows.Count) * 100
+                    pbPloseAnh_Proz.Value = proz
+                    lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
+                    'GroupBox12.Refresh()
+                    My.Application.DoEvents()
+
+                    cnt += 1
+
                Next

                txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0")

            End If

+
+            pbPloseAnh_Proz.Value = 100
+            txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count
+            lblPloseAnh_Proz.Text = "100.00 %"
        End If