Abfrageparameter bei Firmensuche erweitert um Ort, PLZ und Strasse

2023-05-10 10:29:21 +02:00
parent bdc1d8112d
commit 32ec93ec00
5 changed files with 115 additions and 45 deletions
--- a/SDL/Creditsafe/usrcntlCreditsafe.Designer.vb
+++ b/SDL/Creditsafe/usrcntlCreditsafe.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class usrcntlCreditsafe
    Inherits System.Windows.Forms.UserControl

    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class usrcntlCreditsafe
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.btnSearch = New System.Windows.Forms.Button()
@@ -33,7 +33,12 @@ Partial Class usrcntlCreditsafe
        Me.dgvCreditsafe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.btnUebernehmen = New System.Windows.Forms.Button()
+        Me.txtStrasse = New System.Windows.Forms.TextBox()
        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtPLZ = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtOrt = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
        CType(Me.dgvCreditsafe, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -57,7 +62,7 @@ Partial Class usrcntlCreditsafe
        Me.lblUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblUID.AutoSize = True
        Me.lblUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.lblUID.Location = New System.Drawing.Point(550, 16)
+        Me.lblUID.Location = New System.Drawing.Point(671, 16)
        Me.lblUID.Name = "lblUID"
        Me.lblUID.Size = New System.Drawing.Size(40, 13)
        Me.lblUID.TabIndex = 1
@@ -67,9 +72,9 @@ Partial Class usrcntlCreditsafe
        '
        Me.txtUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.txtUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtUID.Location = New System.Drawing.Point(553, 32)
+        Me.txtUID.Location = New System.Drawing.Point(674, 32)
        Me.txtUID.Name = "txtUID"
-        Me.txtUID.Size = New System.Drawing.Size(271, 23)
+        Me.txtUID.Size = New System.Drawing.Size(134, 23)
        Me.txtUID.TabIndex = 3
        '
        'txtFirma
@@ -79,7 +84,7 @@ Partial Class usrcntlCreditsafe
        Me.txtFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
        Me.txtFirma.Location = New System.Drawing.Point(75, 33)
        Me.txtFirma.Name = "txtFirma"
-        Me.txtFirma.Size = New System.Drawing.Size(431, 23)
+        Me.txtFirma.Size = New System.Drawing.Size(173, 23)
        Me.txtFirma.TabIndex = 1
        '
        'lblFirma
@@ -136,6 +141,7 @@ Partial Class usrcntlCreditsafe
        Me.cboLand._allowedValuesFreiText = Nothing
        Me.cboLand._allowFreiText = False
        Me.cboLand._value = ""
+        Me.cboLand.DropDownWidth = 300
        Me.cboLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
        Me.cboLand.FormattingEnabled = True
        Me.cboLand.Location = New System.Drawing.Point(14, 32)
@@ -155,16 +161,65 @@ Partial Class usrcntlCreditsafe
        Me.btnUebernehmen.Text = "Übernehmen"
        Me.btnUebernehmen.UseVisualStyleBackColor = True
        '
+        'txtStrasse
+        '
+        Me.txtStrasse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtStrasse.Location = New System.Drawing.Point(254, 33)
+        Me.txtStrasse.Name = "txtStrasse"
+        Me.txtStrasse.Size = New System.Drawing.Size(163, 23)
+        Me.txtStrasse.TabIndex = 101
+        '
        'Label1
        '
        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label1.Location = New System.Drawing.Point(516, 37)
+        Me.Label1.Location = New System.Drawing.Point(251, 17)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(28, 13)
-        Me.Label1.TabIndex = 10
-        Me.Label1.Text = "oder"
+        Me.Label1.Size = New System.Drawing.Size(42, 13)
+        Me.Label1.TabIndex = 100
+        Me.Label1.Text = "Strasse"
+        '
+        'txtPLZ
+        '
+        Me.txtPLZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtPLZ.Location = New System.Drawing.Point(584, 32)
+        Me.txtPLZ.Name = "txtPLZ"
+        Me.txtPLZ.Size = New System.Drawing.Size(84, 23)
+        Me.txtPLZ.TabIndex = 103
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label2.Location = New System.Drawing.Point(581, 16)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(27, 13)
+        Me.Label2.TabIndex = 102
+        Me.Label2.Text = "PLZ"
+        '
+        'txtOrt
+        '
+        Me.txtOrt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtOrt.Location = New System.Drawing.Point(423, 32)
+        Me.txtOrt.Name = "txtOrt"
+        Me.txtOrt.Size = New System.Drawing.Size(155, 23)
+        Me.txtOrt.TabIndex = 105
+        '
+        'Label3
+        '
+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label3.Location = New System.Drawing.Point(420, 16)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(21, 13)
+        Me.Label3.TabIndex = 104
+        Me.Label3.Text = "Ort"
        '
        'usrcntlCreditsafe
        '
@@ -172,6 +227,11 @@ Partial Class usrcntlCreditsafe
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.txtOrt)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.txtPLZ)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.txtStrasse)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.btnUebernehmen)
        Me.Controls.Add(Me.lblWarning)
@@ -201,5 +261,10 @@ Partial Class usrcntlCreditsafe
    Friend WithEvents dgvCreditsafe As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents lblWarning As Label
    Friend WithEvents btnUebernehmen As Button
+    Friend WithEvents txtStrasse As TextBox
    Friend WithEvents Label1 As Label
+    Friend WithEvents txtPLZ As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtOrt As TextBox
+    Friend WithEvents Label3 As Label
 End Class
--- a/SDL/Creditsafe/usrcntlCreditsafe.vb
+++ b/SDL/Creditsafe/usrcntlCreditsafe.vb
@@ -16,21 +16,21 @@ Public Class usrcntlCreditsafe

        InitializeComponent()
        createCostumer = True
-        'init()

    End Sub


-    Sub New(_UID As String, _name As String, _land As String)
+    Sub New(_UID As String, _name As String, _land As String, _PLZ As String, _Strasse As String, _Ort As String)

        InitializeComponent()
        uidDefault = _UID
        _name = _name.Replace(Chr(34), "") 'Anführungszeichen entfernen
        _name = _name.Replace(Chr(176), "") '° entfernen
        txtFirma.Text = _name
+        txtPLZ.Text = _PLZ
+        txtOrt.Text = _Ort
+        txtStrasse.Text = _Strasse
        land = _land
-        '     init()
-

    End Sub

@@ -98,7 +98,7 @@ Public Class usrcntlCreditsafe

            If cs.authenticate(user, pw) = "200" Then

-                Dim company = New cCreditSafeAPI.Company(txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing)
+                Dim company = New cCreditSafeAPI.Company(txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing, txtStrasse.Text, txtPLZ.Text, txtOrt.Text)
                lblWarning.Text = cs.searchCompanies(company, dataTable).ToString
                initDGV(dataTable)
                Cursor = Cursors.Default
@@ -298,6 +298,10 @@ Public Class usrcntlCreditsafe
        End If
    End Sub

+    Private Sub lblUID_Click(sender As Object, e As EventArgs) Handles lblUID.Click
+
+    End Sub
+
    Private Sub dgvCreditsafe_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvCreditsafe.CellDoubleClick
        If dgvCreditsafe.SelectedRows.Count = 1 Then
            btnUebernehmen.PerformClick()
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -90,7 +90,7 @@
    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>SDL_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>Test.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Accessibility" />
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2740,7 +2740,7 @@ Public Class usrCntlKundenuebersicht
                End Select


-                Dim company As New cCreditSafeAPI.Company("", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing)
+                Dim company As New cCreditSafeAPI.Company("", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "")
                Dim pdfObject As Byte() = Nothing
                If lblBonitaetsdatum._value <> Nothing Then

--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb
@@ -401,20 +401,6 @@ Public Class cCreditSafeAPI

        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token)

-        'Dim json As New Chilkat.JsonObject
-        'Dim success As Boolean = json.Load(jsonRespString)
-        'If (success <> True) Then
-        '    Debug.WriteLine(json.LastErrorText)
-
-        'End If
-
-        'Dim sb As New Chilkat.StringBuilder
-        'json.StringOfSb("pdfReportStream", sb)
-
-        'Dim bd As New Chilkat.BinData
-        'bd.AppendEncodedSb(sb, "base64")
-
-        'Return Convert.FromBase64String(sb.ToString)
        If jsonRespString IsNot Nothing Then
            Return Convert.FromBase64String(jsonRespString)
        End If
@@ -437,10 +423,12 @@ Public Class cCreditSafeAPI
                If company.vatNo <> "" Then
                    rest.AddQueryParam("vatNo", company.vatNo)
                Else
-                    If company.name <> "" Then
-                        rest.AddQueryParam("name", company.name)
-                    End If
-                End If
+                If company.name <> "" Then rest.AddQueryParam("name", company.name)
+                If company.csStreet <> "" Then rest.AddQueryParam("street", company.csStreet)
+                If company.csPostalcode <> "" Then rest.AddQueryParam("postCode", company.csPostalcode)
+                If company.csCity <> "" Then rest.AddQueryParam("city", company.csCity)
+
+            End If



@@ -458,20 +446,27 @@ Public Class cCreditSafeAPI
        Dim success As Boolean = json.Load(jsonRespString)
        If (success <> True) Then
            Debug.WriteLine(json.LastErrorText)
-            Return "Verbindungsfehler"
+            Return New Date()

        End If
        Dim companies As Chilkat.JsonArray = json.ArrayOf("companies")
-        Dim compObj As Chilkat.JsonObject = companies.ObjectAt(0)
-        Dim dateTime As New Chilkat.CkDateTime
-        Dim dt As New Chilkat.DtObj
-        Dim getAsLocal As Boolean = False

-        success = compObj.DateOf("dateOfLatestChange", dateTime)
-        Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
-        Return dateTime.GetAsTimestamp(getAsLocal)
+        If companies IsNot Nothing Then


+            Dim compObj As Chilkat.JsonObject = companies.ObjectAt(0)
+            Dim dateTime As New Chilkat.CkDateTime
+            Dim dt As New Chilkat.DtObj
+            Dim getAsLocal As Boolean = False
+
+            success = compObj.DateOf("dateOfLatestChange", dateTime)
+            Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
+            Return dateTime.GetAsTimestamp(getAsLocal)
+
+        Else
+            Return New Date("01.01.1900")
+        End If
+
    End Function


@@ -507,15 +502,21 @@ Public Class cCreditSafeAPI
        Public Property csDFoundingDate As Date
        Public Property csPDF As String
        Public Property csFailure As String
+        Public Property csCity As String
+        Public Property csPostalcode As String
+        Public Property csStreet As String


-        Public Sub New(_name As String, _vatNo As String, _country As String, _creditsafeNo As String, _creditSafeId As String, _lastChecked As Date)
+        Public Sub New(_name As String, _vatNo As String, _country As String, _creditsafeNo As String, _creditSafeId As String, _lastChecked As Date, _street As String, _postalCode As String, _city As String)
            creditSafeId = _creditSafeId
            name = _name
            vatNo = _vatNo
            country = _country
            creditsafeNo = _creditsafeNo
            lastChecked = _lastChecked
+            csStreet = _street
+            csPostalcode = _postalCode
+            csCity = _city
        End Sub

        Public Sub New()