MDM

2024-11-20 17:59:59 +01:00
parent 7435031346
commit 438a77cea1
4 changed files with 114 additions and 14 deletions
--- a/SDL/USTV/usrCntlUSTV.Designer.vb
+++ b/SDL/USTV/usrCntlUSTV.Designer.vb
@@ -28,6 +28,7 @@ Partial Class usrCntlUSTV
        Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label9 = New System.Windows.Forms.Label()
        Me.txtSumDiff = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button()
        Me.txtSumErst = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -61,7 +62,10 @@ Partial Class usrCntlUSTV
        Me.Button8 = New System.Windows.Forms.Button()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.Label9 = New System.Windows.Forms.Label()
+        Me.txtRisiko = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.txtOPSaldo = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
        CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -109,6 +113,10 @@ Partial Class usrCntlUSTV
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.txtRisiko)
+        Me.Panel1.Controls.Add(Me.Label10)
+        Me.Panel1.Controls.Add(Me.txtOPSaldo)
+        Me.Panel1.Controls.Add(Me.Label11)
        Me.Panel1.Controls.Add(Me.Label9)
        Me.Panel1.Controls.Add(Me.txtSumDiff)
        Me.Panel1.Controls.Add(Me.btnKundendatenaktualisieren)
@@ -140,6 +148,16 @@ Partial Class usrCntlUSTV
        Me.Panel1.Size = New System.Drawing.Size(1627, 108)
        Me.Panel1.TabIndex = 0
        '
+        'Label9
+        '
+        Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(1483, 52)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(102, 13)
+        Me.Label9.TabIndex = 52
+        Me.Label9.Text = "*bis 30.06 -> Vorjahr"
+        '
        'txtSumDiff
        '
        Me.txtSumDiff._DateTimeOnly = False
@@ -634,15 +652,75 @@ Partial Class usrCntlUSTV
        Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
        '
-        'Label9
+        'txtRisiko
        '
-        Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(1483, 52)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(102, 13)
-        Me.Label9.TabIndex = 52
-        Me.Label9.Text = "*bis 30.06 -> Vorjahr"
+        Me.txtRisiko._DateTimeOnly = False
+        Me.txtRisiko._numbersOnly = False
+        Me.txtRisiko._numbersOnlyKommastellen = ""
+        Me.txtRisiko._numbersOnlyTrennzeichen = True
+        Me.txtRisiko._Prozent = False
+        Me.txtRisiko._ShortDateNew = False
+        Me.txtRisiko._ShortDateOnly = False
+        Me.txtRisiko._TimeOnly = False
+        Me.txtRisiko._TimeOnly_Seconds = False
+        Me.txtRisiko._value = ""
+        Me.txtRisiko._Waehrung = True
+        Me.txtRisiko._WaehrungZeichen = True
+        Me.txtRisiko.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtRisiko.ForeColor = System.Drawing.Color.Black
+        Me.txtRisiko.Location = New System.Drawing.Point(882, 45)
+        Me.txtRisiko.MaxLineLength = -1
+        Me.txtRisiko.MaxLines_Warning = ""
+        Me.txtRisiko.MaxLines_Warning_Label = Nothing
+        Me.txtRisiko.Name = "txtRisiko"
+        Me.txtRisiko.ReadOnly = True
+        Me.txtRisiko.Size = New System.Drawing.Size(91, 20)
+        Me.txtRisiko.TabIndex = 56
+        '
+        'Label10
+        '
+        Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(821, 48)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(36, 13)
+        Me.Label10.TabIndex = 55
+        Me.Label10.Text = "Risiko"
+        '
+        'txtOPSaldo
+        '
+        Me.txtOPSaldo._DateTimeOnly = False
+        Me.txtOPSaldo._numbersOnly = False
+        Me.txtOPSaldo._numbersOnlyKommastellen = ""
+        Me.txtOPSaldo._numbersOnlyTrennzeichen = True
+        Me.txtOPSaldo._Prozent = False
+        Me.txtOPSaldo._ShortDateNew = False
+        Me.txtOPSaldo._ShortDateOnly = False
+        Me.txtOPSaldo._TimeOnly = False
+        Me.txtOPSaldo._TimeOnly_Seconds = False
+        Me.txtOPSaldo._value = ""
+        Me.txtOPSaldo._Waehrung = True
+        Me.txtOPSaldo._WaehrungZeichen = True
+        Me.txtOPSaldo.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtOPSaldo.ForeColor = System.Drawing.Color.Black
+        Me.txtOPSaldo.Location = New System.Drawing.Point(882, 25)
+        Me.txtOPSaldo.MaxLineLength = -1
+        Me.txtOPSaldo.MaxLines_Warning = ""
+        Me.txtOPSaldo.MaxLines_Warning_Label = Nothing
+        Me.txtOPSaldo.Name = "txtOPSaldo"
+        Me.txtOPSaldo.ReadOnly = True
+        Me.txtOPSaldo.Size = New System.Drawing.Size(91, 20)
+        Me.txtOPSaldo.TabIndex = 54
+        '
+        'Label11
+        '
+        Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label11.AutoSize = True
+        Me.Label11.Location = New System.Drawing.Point(824, 32)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(52, 13)
+        Me.Label11.TabIndex = 53
+        Me.Label11.Text = "OP-Saldo"
        '
        'usrCntlUSTV
        '
@@ -700,4 +778,8 @@ Partial Class usrCntlUSTV
    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
    Friend WithEvents btnKundendatenaktualisieren As Button
    Friend WithEvents Label9 As Label
+    Friend WithEvents txtRisiko As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents txtOPSaldo As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label11 As Label
 End Class
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -153,13 +153,20 @@ Public Class usrCntlUSTV
            Dim Gesamt3470 As Double = 0
            Dim GesamtVZBetrag As Double = 0
            Dim VorschaubetrGes As Double = 0
+            Dim OPSaldo As Double = 0
+            Dim Risiko As Double = 0
+            Dim calcRisiko As Boolean = False

            If KdSearchBox1.KdNr > 0 Then
                Dim dt As New DataTable
+
                dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR                                                                
                                FROM Kunden 
                                WHERE Kunden.KundenNr = " & KdSearchBox1.KdNr, "FMZOLL")

+
+                OPSaldo = CInt((New SQL).getValueTxtBySql("SELECT sum(Gesamtausstand) FROM [Offene Posten] WHERE [Kontonummer]='" & KdSearchBox1.KdNr & "'", "FMZOLL"))
+                calcRisiko = True
                If dt.Rows.Count = 1 Then
                    GesamtUSteuer = dt.Rows(0).Item("UStV_SummeUmsatzsteuerbetragEUR")
                    GesamtErstattung = dt.Rows(0).Item("UStV_SummeErstattungsbetragEUR")
@@ -188,17 +195,25 @@ Public Class usrCntlUSTV
                    If IsNumeric(rows.Cells("UStVAn_VZBetrag").Value) Then GesamtVZBetrag += rows.Cells("UStVAn_VZBetrag").Value
                Next
                VorschaubetrGes = 0
+                Risiko = 0
            End If


            Differnezbetrag = GesamtUSteuer - GesamtErstattung

+
+            If calcRisiko Then
+                Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes
+            End If
+
            txtSumUst.Text = GesamtUSteuer.ToString("C2")
            txtSumErst.Text = GesamtErstattung.ToString("C2")
            txtSumDiff.Text = Differnezbetrag.ToString("C2")
            txt3470Betrag.Text = Gesamt3470.ToString("C2")
            txtVZBetrag.Text = GesamtVZBetrag.ToString("C2")
            txtVorschaubetrGes.Text = VorschaubetrGes.ToString("C2")
+            txtOPSaldo.Text = OPSaldo.ToString("C2")
+            txtRisiko.Text = Risiko.ToString("C2")


        End With
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -2241,7 +2241,7 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2823,10 +2823,11 @@ Public Class usrCntlKundenuebersicht


                        Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
-                        company.lastChecked = lastChecked
+                    company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1))

-                        If lastChecked = Today Then
-                            Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today)
+                    If lastChecked = Today Then
+                        Dim bonaus = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrDate(kdNr, Today)
+                        If bonaus IsNot Nothing Then
                            If bonaus.ba_Pruefungstool = "creditsafe API" AndAlso bonaus.ba_datenarchivId > -1 Then
                                MsgBox("Heute wurde bereits eine erfolgreiche Abfrage durchgeführt" & vbNewLine & "Vorgang wird abgebrochen!")
                                Cursor = Cursors.Default
@@ -2834,11 +2835,13 @@ Public Class usrCntlKundenuebersicht
                                Exit Sub
                            End If
                        End If
+                    End If




-                        If cs.checkDateOfLastRequest(company) < lastChecked Then
+
+                    If cs.checkDateOfLastRequest(company) < lastChecked Then
                            Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
                            If a = vbYes Then