Bonität Neu

SDL/kunden/frmBonitaet.vb

@@ -6,7 +6,7 @@ Public Class frmBonitaet
 
     Public KdNR As Integer
     Dim ADRESSE As VERAG_PROG_ALLGEMEIN.cAdressen
-    Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL
+    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Sub New(KdNR As Integer)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -37,13 +37,33 @@ Public Class frmBonitaet
             cBonitaetsauskunft.ba_KundenNr = (KdNR)
             cBonitaetsauskunft.ba_Datum = cProgramFunctions.isLeerNothing(txtCRDatum._value)
 
-            cBonitaetsauskunft.ba_BonitaetsIndex = If(IsNumeric(txtBonitaetsindex.Text), txtBonitaetsindex.Text, 0)
+            'Initual alle Stufen/Scores/Index-Variablen auf Nohting setzen
-            If cboTool._value = "creditsafe" Then
+            cBonitaetsauskunft.ba_BonitaetsIndex = Nothing
-                cBonitaetsauskunft.ba_Risikoklasse = cboRisikostufe._value
+            cBonitaetsauskunft.ba_Risikostufe = Nothing
+
+            cBonitaetsauskunft.ba_CreditSaveBonitaetsScore = Nothing
+            cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = Nothing
+            cBonitaetsauskunft.ba_CreditSaveRisikoklasse = Nothing
+
+            Select Case cboTool._value
+                Case "creditsafe"
+                    cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = If(IsNumeric(txtBonitaetsindex.Text), CDbl(txtBonitaetsindex.Text), 0)
+
+                Case "creditsafe AT"
+                    cBonitaetsauskunft.ba_CreditSaveBonitaetsScore = If(IsNumeric(txtBonitaetsindex.Text), CInt(txtBonitaetsindex.Text), 0)
+
+                Case Else : cBonitaetsauskunft.ba_BonitaetsIndex = If(IsNumeric(txtBonitaetsindex.Text), CInt(txtBonitaetsindex.Text), 0)
+
+            End Select
+
+
+            If isCreditSave() Then
+                cBonitaetsauskunft.ba_CreditSaveRisikoklasse = cboRisikostufe._value
+
             Else
                 cBonitaetsauskunft.ba_Risikostufe = If(IsNumeric(cboRisikostufe._value), cboRisikostufe._value, Nothing)
-            End If
 
+            End If
 
             cBonitaetsauskunft.ba_Pruefungstool = cboTool._value
 
@@ -57,14 +77,14 @@ Public Class frmBonitaet
             cBonitaetsauskunft.ba_GruendundsDatum = cProgramFunctions.isLeerNothing(txtGruendungsdatum._value)
 
             If cBonitaetsauskunft.SAVE Then
-                VSQL.doSQL("UPDATE Kunden SET Bonität='" & cBonitaetsauskunft.ba_BonitaetsIndex & "', Bonitätsdatum='" & cBonitaetsauskunft.ba_Datum & "', Höchstkredit=" & If(cBonitaetsauskunft.ba_Hoechstkredit Is Nothing, "null", "'" & cBonitaetsauskunft.ba_Hoechstkredit & "'") & " WHERE KundenNr='" & cBonitaetsauskunft.ba_KundenNr & "'", "FMZOLL")
+                SQL.doSQL("UPDATE Kunden SET Bonität='" & cBonitaetsauskunft.ba_BonitaetsIndex & "', Bonitätsdatum='" & cBonitaetsauskunft.ba_Datum & "', Höchstkredit=" & If(cBonitaetsauskunft.ba_Hoechstkredit Is Nothing, "null", "'" & cBonitaetsauskunft.ba_Hoechstkredit & "'") & " WHERE KundenNr='" & cBonitaetsauskunft.ba_KundenNr & "'", "FMZOLL")
+
                 Dim KDERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KdNR)
 
-                If cboTool._value = "creditsafe" Then
+                KDERW.kde_CreditSaveBonitaetsIndex = cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex
-                    KDERW.kde_Bonitaetsklasse = cBonitaetsauskunft.ba_Risikoklasse
+                KDERW.kde_CreditSaveBonitaetsScore = cBonitaetsauskunft.ba_CreditSaveBonitaetsScore
-                Else
+                KDERW.kde_CreditSaveBonitaetsklasse = cBonitaetsauskunft.ba_CreditSaveRisikoklasse
-                    KDERW.kde_BonitaetsStufe = cBonitaetsauskunft.ba_Risikostufe
+                KDERW.kde_BonitaetsStufe = cBonitaetsauskunft.ba_Risikostufe
-                End If
 
                 KDERW.SAVE()
                     Me.Close()
@@ -79,30 +99,28 @@ Public Class frmBonitaet
 
     Private Sub frmBonitaet_Load(sender As Object, e As EventArgs) Handles Me.Load
 
-
+        Label2.Visible = False
-        If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then
-
-            lblBonitätsindex.Text = "Boni-Score"
-        Else
-
-            lblBonitätsindex.Text = "Bonitätsindex:"
-
-        End If
 
         cboTool.Items.Clear()
+        cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe AT", "creditsafe AT"))
         cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe", "creditsafe"))
         cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Creditreform", "creditreform"))
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
-            Case "IMEX" : cboTool.changeItem("CreditSafe")
+            'Case "IMEX" : cboTool.changeItem("CreditSafe")
-
-
 
             Case Else : If Now.ToShortDateString >= DateTime.Parse("01/12/2022") Then
-                    cboTool.changeItem("CreditSafe")
+                    If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then
+                        cboTool.changeItem("CreditSafe AT")
+                        lblBonitätsindex.Text = "Boni-Score"
+                    Else
+                        cboTool.changeItem("CreditSafe")
+                        lblBonitätsindex.Text = "Bonitätsindex:"
+                    End If
                 Else
                     cboTool.changeItem("Creditreform")
+                    lblBonitätsindex.Text = "Bonitätsindex:"
                 End If
 
         End Select
@@ -113,12 +131,13 @@ Public Class frmBonitaet
     End Sub
 
     Private Sub cboTool_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboTool.SelectedValueChanged
+        setCboItem()
         setRisikostufeList()
     End Sub
 
     Private Sub setRisikostufeList()
 
-        If (cboTool._value = "creditsafe") Then
+        If isCreditSave() Then ' Creditsave verwendet als Risikostufe ein CHAR, Altsystem CreditReform einen INT-Wert!
 
             cboRisikostufe.Items.Clear()
             cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -146,4 +165,26 @@ Public Class frmBonitaet
 
     End Sub
 
+    Private Function isCreditSave() As Boolean
+
+        If cboTool._value = "creditsafe" Or cboTool._value = "creditsafe AT" Then
+            Return True
+        Else
+            Return False
+        End If
+
+    End Function
+
+    Private Sub setCboItem()
+
+        If cboTool._value = "creditsafe AT" Then
+            lblBonitätsindex.Text = "Boni-Score"
+        Else
+            lblBonitätsindex.Text = "Bonitätsindex:"
+        End If
+
+
+    End Sub
+
+
 End Class

SDL/kunden/frmBonitätsverlauf.vb

@@ -44,7 +44,7 @@
                     .SET_SQL(sqlstr, "FMZOLL")
                     .LOAD()
 
-                    If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+
                     .RowHeadersVisible = False
                     .ReadOnly = True
                     .SelectionMode = DataGridViewSelectionMode.FullRowSelect
@@ -70,6 +70,7 @@
                     For Each c As DataGridViewColumn In .Columns
                         c.HeaderText = c.Name.Replace("ba_", "")
                     Next
+                    If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
                 End With
             End If
 

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -544,14 +544,34 @@ Public Class usrCntlKundenuebersicht
             ' Catch ex As Exception : End Try
             '     End If
             '  End If
-            lblBonitaet.Text = If(KUNDE.Bonität, "")
+
+
+
+            If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then
+                lblBonitaet.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsScore, "")
+            Else
+                lblBonitaet.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsIndex, "")
+            End If
+
+            If lblBonitaet.Text = "" Then
+                lblBonitaet.Text = If(KUNDE.Bonität, "")
+            End If
+
+            lblBonitaetRisikostufe.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsklasse, "")
+            If lblBonitaetRisikostufe.Text = "" Then
+
+                lblBonitaetRisikostufe.Text = If(KUNDE_ERW.kde_BonitaetsStufe, "")
+
+            End If
+
+
             If lblBonitaet.Text = "0" Then lblBonitaet.Text = ""
+
             If KUNDE.Bonitätsdatum IsNot Nothing AndAlso IsDate(KUNDE.Bonitätsdatum) Then
                 lblBonitaetsdatum.Text = CDate(KUNDE.Bonitätsdatum).ToShortDateString
             Else
                 lblBonitaetsdatum.Text = ""
             End If
-            lblBonitaetRisikostufe.Text = If(KUNDE_ERW.kde_BonitaetsStufe, "")
 
             lblHoechstkredit._value = If(IsNumeric(If(KUNDE.Höchstkredit, "")), KUNDE.Höchstkredit, "")
 

VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb

@@ -15,7 +15,7 @@ Public Class cBonitaetsauskunft
     Property ba_Adresse1 As String = ""
     Property ba_Adresse2 As String = ""
     Property ba_LetztesBearbeitungsDatum As Object = Nothing
-    Property ba_BonitaetsIndex As Integer
+    Property ba_BonitaetsIndex As Object = Nothing
     Property ba_GruendundsDatum As Object = Nothing
     Property ba_Umsatz As Object = Nothing
     Property ba_Mitarbeiter As Object = Nothing
@@ -25,7 +25,9 @@ Public Class cBonitaetsauskunft
     Property ba_GFName As Object = Nothing
     Property ba_Sonstiges As Object = Nothing
     Property ba_Risikostufe As Object = Nothing
-    Property ba_Risikoklasse As Object = Nothing
+    Property ba_CreditSaveRisikoklasse As Object = Nothing
+    Property ba_CreditSaveBonitaetsScore As Object = Nothing
+    Property ba_CreditSaveBonitaetsIndex As Object = Nothing
     Property ba_Pruefungstool As Object = Nothing
 
 
@@ -63,8 +65,10 @@ Public Class cBonitaetsauskunft
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_GFName", ba_GFName))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Sonstiges", ba_Sonstiges))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Risikostufe", ba_Risikostufe))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Risikoklasse", ba_Risikoklasse))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CreditSaveRisikoklasse", ba_CreditSaveRisikoklasse))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Pruefungstool", ba_Pruefungstool))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CreditSaveBonitaetsScore", ba_CreditSaveBonitaetsScore))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CreditSaveBonitaetsIndex", ba_CreditSaveBonitaetsIndex))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -49,8 +49,9 @@ Public Class cKundenErweitert
     Property EmailAnkunft_Export As Boolean = False
     Property EmailFreigabe_Export As Boolean = False
     Property kde_BonitaetsStufe As Object = Nothing
-    Property kde_Bonitaetsklasse As Object = Nothing
+    Property kde_CreditSaveBonitaetsklasse As Object = Nothing
-
+    Property kde_CreditSaveBonitaetsIndex As Object = Nothing
+    Property kde_CreditSaveBonitaetsScore As Object = Nothing
     Property kde_Inkasso_Uebergeben As Boolean = False
     Property kde_Inkasso_UebergebenAm As Object = Nothing
     Property kde_Inkasso_GemeldeterBetrag As Object = Nothing
@@ -59,7 +60,6 @@ Public Class cKundenErweitert
     Property Anmerkungen_Warnhinweis As Object = Nothing
     Property kde_VERAG_INTERFACE_ID As Object = Nothing
     Property kde_BesonderheitenNeu As Boolean = False
-
     Property kde_InfoAuftragsNr As Object = Nothing
     Property kde_KundeFremdspedition As Boolean = False
     Property kde_verzolltBei As Object = Nothing
@@ -133,7 +133,9 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FakturierungSR_Details", kde_FakturierungSR_Details))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Fakturierung_Sprache", kde_Fakturierung_Sprache))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_TOBB_KundenNr", kde_TOBB_KundenNr))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Bonitaetsklasse", kde_Bonitaetsklasse))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveBonitaetsklasse", kde_CreditSaveBonitaetsklasse))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveBonitaetsIndex", kde_CreditSaveBonitaetsIndex))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveBonitaetsScore", kde_CreditSaveBonitaetsScore))
 
         Return list
     End Function