MDMAusewrtung, faktEmail, etc.

2026-01-28 12:04:18 +01:00
parent 8896aa1def
commit 44a58bc077
13 changed files with 276 additions and 125 deletions
--- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
+++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb
@@ -129,6 +129,10 @@ Partial Class usrCntlMDMAuswertungen
        Me.TabPage3 = New System.Windows.Forms.TabPage()
        Me.Label66 = New System.Windows.Forms.Label()
        Me.GroupBox20 = New System.Windows.Forms.GroupBox()
+        Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label67 = New System.Windows.Forms.Label()
        Me.PictureBox7 = New System.Windows.Forms.PictureBox()
        Me.Label45 = New System.Windows.Forms.Label()
        Me.Label64 = New System.Windows.Forms.Label()
@@ -197,10 +201,7 @@ Partial Class usrCntlMDMAuswertungen
        Me.btnContractdaten = New System.Windows.Forms.Button()
        Me.Button15 = New System.Windows.Forms.Button()
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.Label67 = New System.Windows.Forms.Label()
-        Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtLeistungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.cboQuartal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1444,6 +1445,7 @@ Partial Class usrCntlMDMAuswertungen
        '
        'GroupBox20
        '
+        Me.GroupBox20.Controls.Add(Me.cbxNurUnter50EUR)
        Me.GroupBox20.Controls.Add(Me.cboQuartal)
        Me.GroupBox20.Controls.Add(Me.txtLeistungsNr)
        Me.GroupBox20.Controls.Add(Me.txtJahr)
@@ -1459,6 +1461,73 @@ Partial Class usrCntlMDMAuswertungen
        Me.GroupBox20.TabIndex = 14
        Me.GroupBox20.TabStop = False
        '
+        'cboQuartal
+        '
+        Me.cboQuartal._allowedValuesFreiText = Nothing
+        Me.cboQuartal._allowFreiText = False
+        Me.cboQuartal._value = ""
+        Me.cboQuartal.FormattingEnabled = True
+        Me.cboQuartal.Location = New System.Drawing.Point(306, 46)
+        Me.cboQuartal.Name = "cboQuartal"
+        Me.cboQuartal.Size = New System.Drawing.Size(59, 21)
+        Me.cboQuartal.TabIndex = 16
+        '
+        'txtLeistungsNr
+        '
+        Me.txtLeistungsNr._DateTimeOnly = False
+        Me.txtLeistungsNr._numbersOnly = False
+        Me.txtLeistungsNr._numbersOnlyKommastellen = ""
+        Me.txtLeistungsNr._numbersOnlyTrennzeichen = True
+        Me.txtLeistungsNr._Prozent = False
+        Me.txtLeistungsNr._ShortDateNew = False
+        Me.txtLeistungsNr._ShortDateOnly = False
+        Me.txtLeistungsNr._TimeOnly = False
+        Me.txtLeistungsNr._TimeOnly_Seconds = False
+        Me.txtLeistungsNr._value = "327"
+        Me.txtLeistungsNr._Waehrung = False
+        Me.txtLeistungsNr._WaehrungZeichen = True
+        Me.txtLeistungsNr.ForeColor = System.Drawing.Color.Black
+        Me.txtLeistungsNr.Location = New System.Drawing.Point(306, 73)
+        Me.txtLeistungsNr.MaxLineLength = -1
+        Me.txtLeistungsNr.MaxLines_Warning = ""
+        Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
+        Me.txtLeistungsNr.Name = "txtLeistungsNr"
+        Me.txtLeistungsNr.Size = New System.Drawing.Size(93, 20)
+        Me.txtLeistungsNr.TabIndex = 15
+        Me.txtLeistungsNr.Text = "327"
+        '
+        'txtJahr
+        '
+        Me.txtJahr._DateTimeOnly = False
+        Me.txtJahr._numbersOnly = False
+        Me.txtJahr._numbersOnlyKommastellen = ""
+        Me.txtJahr._numbersOnlyTrennzeichen = True
+        Me.txtJahr._Prozent = False
+        Me.txtJahr._ShortDateNew = False
+        Me.txtJahr._ShortDateOnly = False
+        Me.txtJahr._TimeOnly = False
+        Me.txtJahr._TimeOnly_Seconds = False
+        Me.txtJahr._value = ""
+        Me.txtJahr._Waehrung = False
+        Me.txtJahr._WaehrungZeichen = True
+        Me.txtJahr.ForeColor = System.Drawing.Color.Black
+        Me.txtJahr.Location = New System.Drawing.Point(185, 47)
+        Me.txtJahr.MaxLineLength = -1
+        Me.txtJahr.MaxLines_Warning = ""
+        Me.txtJahr.MaxLines_Warning_Label = Nothing
+        Me.txtJahr.Name = "txtJahr"
+        Me.txtJahr.Size = New System.Drawing.Size(53, 20)
+        Me.txtJahr.TabIndex = 13
+        '
+        'Label67
+        '
+        Me.Label67.AutoSize = True
+        Me.Label67.Location = New System.Drawing.Point(145, 80)
+        Me.Label67.Name = "Label67"
+        Me.Label67.Size = New System.Drawing.Size(155, 13)
+        Me.Label67.TabIndex = 12
+        Me.Label67.Text = "LeistungsNr (Komma-getrennt).:"
+        '
        'PictureBox7
        '
        Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.woelfl
@@ -2173,72 +2242,17 @@ Partial Class usrCntlMDMAuswertungen
        Me.pnl.Size = New System.Drawing.Size(1057, 54)
        Me.pnl.TabIndex = 26
        '
-        'Label67
+        'cbxNurUnter50EUR
        '
-        Me.Label67.AutoSize = True
-        Me.Label67.Location = New System.Drawing.Point(145, 80)
-        Me.Label67.Name = "Label67"
-        Me.Label67.Size = New System.Drawing.Size(155, 13)
-        Me.Label67.TabIndex = 12
-        Me.Label67.Text = "LeistungsNr (Komma-getrennt).:"
-        '
-        'txtJahr
-        '
-        Me.txtJahr._DateTimeOnly = False
-        Me.txtJahr._numbersOnly = False
-        Me.txtJahr._numbersOnlyKommastellen = ""
-        Me.txtJahr._numbersOnlyTrennzeichen = True
-        Me.txtJahr._Prozent = False
-        Me.txtJahr._ShortDateNew = False
-        Me.txtJahr._ShortDateOnly = False
-        Me.txtJahr._TimeOnly = False
-        Me.txtJahr._TimeOnly_Seconds = False
-        Me.txtJahr._value = ""
-        Me.txtJahr._Waehrung = False
-        Me.txtJahr._WaehrungZeichen = True
-        Me.txtJahr.ForeColor = System.Drawing.Color.Black
-        Me.txtJahr.Location = New System.Drawing.Point(185, 47)
-        Me.txtJahr.MaxLineLength = -1
-        Me.txtJahr.MaxLines_Warning = ""
-        Me.txtJahr.MaxLines_Warning_Label = Nothing
-        Me.txtJahr.Name = "txtJahr"
-        Me.txtJahr.Size = New System.Drawing.Size(53, 20)
-        Me.txtJahr.TabIndex = 13
-        '
-        'txtLeistungsNr
-        '
-        Me.txtLeistungsNr._DateTimeOnly = False
-        Me.txtLeistungsNr._numbersOnly = False
-        Me.txtLeistungsNr._numbersOnlyKommastellen = ""
-        Me.txtLeistungsNr._numbersOnlyTrennzeichen = True
-        Me.txtLeistungsNr._Prozent = False
-        Me.txtLeistungsNr._ShortDateNew = False
-        Me.txtLeistungsNr._ShortDateOnly = False
-        Me.txtLeistungsNr._TimeOnly = False
-        Me.txtLeistungsNr._TimeOnly_Seconds = False
-        Me.txtLeistungsNr._value = "327"
-        Me.txtLeistungsNr._Waehrung = False
-        Me.txtLeistungsNr._WaehrungZeichen = True
-        Me.txtLeistungsNr.ForeColor = System.Drawing.Color.Black
-        Me.txtLeistungsNr.Location = New System.Drawing.Point(306, 73)
-        Me.txtLeistungsNr.MaxLineLength = -1
-        Me.txtLeistungsNr.MaxLines_Warning = ""
-        Me.txtLeistungsNr.MaxLines_Warning_Label = Nothing
-        Me.txtLeistungsNr.Name = "txtLeistungsNr"
-        Me.txtLeistungsNr.Size = New System.Drawing.Size(93, 20)
-        Me.txtLeistungsNr.TabIndex = 15
-        Me.txtLeistungsNr.Text = "327"
-        '
-        'cboQuartal
-        '
-        Me.cboQuartal._allowedValuesFreiText = Nothing
-        Me.cboQuartal._allowFreiText = False
-        Me.cboQuartal._value = ""
-        Me.cboQuartal.FormattingEnabled = True
-        Me.cboQuartal.Location = New System.Drawing.Point(306, 46)
-        Me.cboQuartal.Name = "cboQuartal"
-        Me.cboQuartal.Size = New System.Drawing.Size(59, 21)
-        Me.cboQuartal.TabIndex = 16
+        Me.cbxNurUnter50EUR.AutoSize = True
+        Me.cbxNurUnter50EUR.Checked = True
+        Me.cbxNurUnter50EUR.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxNurUnter50EUR.Location = New System.Drawing.Point(414, 73)
+        Me.cbxNurUnter50EUR.Name = "cbxNurUnter50EUR"
+        Me.cbxNurUnter50EUR.Size = New System.Drawing.Size(111, 17)
+        Me.cbxNurUnter50EUR.TabIndex = 17
+        Me.cbxNurUnter50EUR.Text = "Nur unter 50 EUR"
+        Me.cbxNurUnter50EUR.UseVisualStyleBackColor = True
        '
        'usrCntlMDMAuswertungen
        '
@@ -2493,4 +2507,5 @@ Partial Class usrCntlMDMAuswertungen
    Friend WithEvents Label67 As Label
    Friend WithEvents txtLeistungsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents cboQuartal As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxNurUnter50EUR As CheckBox
 End Class
--- a/SDL/mdm/usrCntlMDMAuswertungen.vb
+++ b/SDL/mdm/usrCntlMDMAuswertungen.vb
@@ -1531,35 +1531,8 @@ Public Class usrCntlMDMAuswertungen
                Jahr = txtJahr.Text
            End If

-            Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Betrag', 50 - sum(Temp.Betrag) as Differenzbetrag from (SELECT
-              USTVA.UStVAn_KuNr as KundenNr,
-              USTVA.UStVAn_Name as Kundenname,
-              YEAR(R.Abfertigungsdatum)                    AS Jahr,
-              DATEPART(QUARTER, R.Abfertigungsdatum)       AS Quartal,
-              POS.LeistungsNr,
-              SUM(POS.SteuerfreierBetrag + POS.SteuerpflichtigerBetrag) AS Betrag
-          FROM tblUStVAntrag AS USTVA
-          INNER JOIN Rechnungsausgang AS R
-              ON R.FilialenNr     = USTVA.FilialenNr
-             AND R.AbfertigungsNr = USTVA.AbfertigungsNr
-          INNER JOIN RechnungsausgangPositionen AS POS
-              ON R.RK_ID = POS.RK_ID
-          WHERE USTVA.UStVAn_KuNr LIKE '15%'
-
-            AND YEAR(R.Abfertigungsdatum) = " & Jahr &
-            " AND POS.LeistungsNr IN (" & IIf(txtLeistungsNr.Text <> "", txtLeistungsNr.Text, "") & ")
-          GROUP BY
-              USTVA.UStVAn_KuNr,
-              USTVA.UStVAn_Name,
-              YEAR(R.Abfertigungsdatum),
-              DATEPART(QUARTER, R.Abfertigungsdatum),
-              POS.LeistungsNr
-          ) as Temp
-          	WHERE 1 = 1 " & IIf(cboQuartal._value.Trim() <> "", " AND temp.Quartal = " & cboQuartal._value, "") & " 
-          	Group by Temp.KundenNr, Temp.Kundenname, Temp.Jahr, Temp.Quartal
-          	Having sum(Temp.Betrag) < 50"
-
-            Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL")
+            Dim rmc As cRMC
+            Dim dt = rmc.getRMCQuartalsAbrechnungen(New VERAG_PROG_ALLGEMEIN.SQL, cboQuartal._value.Trim(), Jahr, txtLeistungsNr.Text,,, cbxNurUnter50EUR.Checked)

            If dt.Rows.Count > 0 Then
                cProgramFunctions.genExcelFromDT_NEW(dt)
@@ -1568,8 +1541,6 @@ Public Class usrCntlMDMAuswertungen
            End If


-
-
        Catch ex As System.Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try