Fiskalubersicht und Creditsafe-Verbesserungen

This commit is contained in:
2023-07-18 16:18:36 +02:00
parent d0657deda8
commit 07fd73fb69
8 changed files with 411 additions and 97 deletions

View File

@@ -103,7 +103,7 @@ Public Class usrcntlCreditsafe
If cs.authenticate(user, pw) = "200" Then
Dim company = New cCreditSafeAPI.Company(cbxSprache._value, txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing, txtStrasse.Text, txtPLZ.Text, txtOrt.Text, "", "", "", "", "")
Dim company = New cCreditSafeAPI.Company(cbxSprache._value, 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

View File

@@ -350,17 +350,17 @@ Partial Class usrCntlAdresse
Friend WithEvents Label12 As System.Windows.Forms.Label
Friend WithEvents Label11 As System.Windows.Forms.Label
Friend WithEvents Label9 As System.Windows.Forms.Label
Friend WithEvents txtPlz As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents kdFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox
Public WithEvents txtPlz As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents txtStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents kdFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtEORINL As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents txtEORINL As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents txtAnsprechpartner As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents sbLand As VERAG_PROG_ALLGEMEIN.MySearchBox
Friend WithEvents txtkdNr As System.Windows.Forms.Label
Public WithEvents txtAnsprechpartner As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
Public WithEvents sbLand As VERAG_PROG_ALLGEMEIN.MySearchBox
Public WithEvents txtkdNr As System.Windows.Forms.Label
Friend WithEvents FlatButton3 As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton
End Class

View File

@@ -2739,7 +2739,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, "", "", "", "", "", "", "", "", "")
If lblBonitaetsdatum._value <> Nothing Then
@@ -2809,7 +2809,7 @@ Public Class usrCntlKundenuebersicht
cBonitaetsauskunft.ba_Pruefungstool = "creditsafe API"
' Öster. Unternemen -> Creditscore, sonst Index
If (IsNumeric(company.csIndex)) Then
company.csIndex = company.csIndex.Replace(".", ",")
cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = CDbl(company.csIndex)
@@ -2846,6 +2846,7 @@ Public Class usrCntlKundenuebersicht
cBonitaetsauskunft.ba_GSName = company.csShareholder
cBonitaetsauskunft.ba_Geschaeftszweck = company.csBusinessPurpose
cBonitaetsauskunft.ba_Umsatz = company.csTurnover
If company.csSumEmployees <> "" And IsNumeric(company.csSumEmployees) Then
cBonitaetsauskunft.ba_Mitarbeiter = CInt(company.csSumEmployees)
@@ -2886,7 +2887,7 @@ Public Class usrCntlKundenuebersicht
Private Sub initCreditsave()
If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then
If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "NL" Then
lblBonitaet.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsScore, "")
Else
lblBonitaet.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsIndex, "")

View File

@@ -93,6 +93,7 @@ Partial Class usrcntlFiskaluebersicht
Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cbxUID = New System.Windows.Forms.CheckBox()
Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblUmsatz = New System.Windows.Forms.Label()
CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit()
Me.MyPanel1.SuspendLayout()
CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -290,6 +291,7 @@ Partial Class usrcntlFiskaluebersicht
Me.MyPanel2.AutoScrollMinSize = New System.Drawing.Size(0, 10)
Me.MyPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.MyPanel2.BackColor = System.Drawing.Color.White
Me.MyPanel2.Controls.Add(Me.lblUmsatz)
Me.MyPanel2.Controls.Add(Me.Label14)
Me.MyPanel2.Controls.Add(Me.txtUmsatz)
Me.MyPanel2.Controls.Add(Me.cbxUntervm)
@@ -1150,6 +1152,15 @@ Partial Class usrcntlFiskaluebersicht
Me.txtUID.Size = New System.Drawing.Size(86, 20)
Me.txtUID.TabIndex = 106
'
'lblUmsatz
'
Me.lblUmsatz.AutoSize = True
Me.lblUmsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblUmsatz.Location = New System.Drawing.Point(248, 190)
Me.lblUmsatz.Name = "lblUmsatz"
Me.lblUmsatz.Size = New System.Drawing.Size(0, 13)
Me.lblUmsatz.TabIndex = 186
'
'usrcntlFiskaluebersicht
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1257,4 +1268,5 @@ Partial Class usrcntlFiskaluebersicht
Friend WithEvents txtUVM As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label14 As Label
Friend WithEvents txtUmsatz As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents lblUmsatz As Label
End Class

View File

@@ -143,7 +143,4 @@
<metadata name="cbxHomepage.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cbxHomepage.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

View File

@@ -57,7 +57,15 @@ Public Class usrcntlFiskaluebersicht
Label2.Text = "Top 5 Lieferanten (" & year & ")"
With dgvLieferanten
.Columns.Clear()
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') as KdNr, MAX(Absender) as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr, [Absender] ORDER BY Anzahl DESC ", "FMZOLL")
.DataSource() = SQL.loadDgvBySql("SELECT isnull(KdNr,'') as Kdnr, Firma, Anzahl
FROM (SELECT [AbsenderKundenNr] as KdNr ,MAX([Absender]) as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([AbsenderKundenNr],'')<>'' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr
UNION ALL
SELECT MAX(AbsenderKundenNr) as KdNr, [Absender] as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([AbsenderKundenNr],'')='' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY Absender) t
ORDER BY Anzahl desc", "FMZOLL")
.Columns("KdNr").Width = 50
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Anzahl").Width = 40
@@ -81,7 +89,16 @@ Public Class usrcntlFiskaluebersicht
Label3.Text = "Top 5 Empfänger (" & year & ")"
With dgvEmpfaenger
.Columns.Clear()
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([EmpfängerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & "AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr, Empfänger ORDER BY Anzahl DESC ", "FMZOLL")
.DataSource() = SQL.loadDgvBySql("SELECT isnull(KdNr,'') as Kdnr, Firma, Anzahl
FROM (SELECT [EmpfängerKundenNr] as KdNr ,MAX([Empfänger]) as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([EmpfängerKundenNr],'')<>'' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr
UNION ALL
SELECT MAX(EmpfängerKundenNr) as KdNr, [Empfänger] as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([EmpfängerKundenNr],'')='' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY Empfänger) t
ORDER BY Anzahl desc", "FMZOLL")
'.DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([EmpfängerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & "AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr, Empfänger ORDER BY Anzahl DESC ", "FMZOLL")
.Columns("KdNr").Width = 50
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Anzahl").Width = 40
@@ -103,7 +120,16 @@ Public Class usrcntlFiskaluebersicht
Label6.Text = "Top 5 Auftraggeber (" & year & ")"
With dgvZwischenh
.Columns.Clear()
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([VermittlerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr, Vermittler ORDER BY Anzahl DESC ", "FMZOLL")
.DataSource() = SQL.loadDgvBySql("SELECT isnull(KdNr,'') as Kdnr, Firma, Anzahl
FROM (SELECT [VermittlerKundenNr] as KdNr ,MAX([Vermittler]) as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([VermittlerKundenNr],'')<>'' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY VermittlerKundenNr
UNION ALL
SELECT MAX(VermittlerKundenNr) as KdNr, [Vermittler] as Firma, COUNT(*) as Anzahl
FROM [Speditionsbuch]
WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND isnull([VermittlerKundenNr],'')='' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY Vermittler) t
ORDER BY Anzahl desc", "FMZOLL")
'.DataSource() = SQL.loadDgvBySql("SELECT Top(5) isnull(cast([VermittlerKundenNr]as nvarchar(7)) + ' ','') as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "'" & where & " AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr, Vermittler ORDER BY Anzahl DESC ", "FMZOLL")
.Columns("KdNr").Width = 50
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Anzahl").Width = 40
@@ -455,6 +481,8 @@ Public Class usrcntlFiskaluebersicht
If txtKredit.Text = "" Then txtKredit.Text = BA.ba_Hoechstkredit
lblUmsatz.Text = IIf(BA.ba_Umsatz <> "", BA.ba_Umsatz, "")
If txtGF.Text = "" Then txtGF.Text = BA.ba_GFName
If txtGeschaeftszweck.Text = "" Then txtGeschaeftszweck.Text = BA.ba_Geschaeftszweck
@@ -902,7 +930,7 @@ Public Class usrcntlFiskaluebersicht
If Not IsValidURL(txtHomepage.Text) Then Exit Sub
If Not checkWebsite(url) Then Exit Sub
If Not checkWebsite(txtHomepage.Text) Then Exit Sub
Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam....
@@ -1092,7 +1120,7 @@ Public Class usrcntlFiskaluebersicht
If Not IsValidURL(txtWebsiteSt.Text) Then Exit Sub
If Not checkWebsite(url) Then Exit Sub
If Not checkWebsite(txtWebsiteSt.Text) Then Exit Sub
Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam....
@@ -1139,4 +1167,6 @@ Public Class usrcntlFiskaluebersicht
Return True
End Function
End Class