Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -1395,6 +1395,13 @@ Public Class cProgramFunctions
|
||||
|
||||
End Sub
|
||||
|
||||
Function MessageTimeOut(sMessage As String, sTitle As String, iSeconds As Integer) As Boolean
|
||||
Dim Shell
|
||||
Shell = CreateObject("WScript.Shell")
|
||||
Shell.Run("mshta.exe vbscript:close(CreateObject(""WScript.shell"").Popup(""" & sMessage & """," & iSeconds & ",""" & sTitle & """))")
|
||||
MessageTimeOut = True
|
||||
End Function
|
||||
|
||||
End Class
|
||||
|
||||
|
||||
|
||||
@@ -2716,25 +2716,6 @@ Public Class usrCntlKundenuebersicht
|
||||
End If
|
||||
|
||||
|
||||
|
||||
'Using UserControl1 As usrcntlCreditsafe = New usrcntlCreditsafe(UID, name, land)
|
||||
' Using tmpForm As Form = New Form()
|
||||
' tmpForm.Width = UserControl1.Width + 10
|
||||
' tmpForm.Height = UserControl1.Height + 40
|
||||
' tmpForm.Text = "Creditsafe-Firmensuche"
|
||||
' tmpForm.StartPosition = tmpForm.StartPosition.CenterParent
|
||||
' tmpForm.Controls.Add(UserControl1)
|
||||
' If tmpForm.ShowDialog() = DialogResult.OK Then
|
||||
' KUNDE_ERW.kde_CreditSaveId = UserControl1.comp.credissafeId
|
||||
' KUNDE_ERW.kde_CreditSaveNo = UserControl1.comp.safeNo
|
||||
' KUNDE_ERW.SAVE()
|
||||
|
||||
' End If
|
||||
|
||||
|
||||
' End Using
|
||||
'End Using
|
||||
|
||||
Else
|
||||
Dim cs = New cCreditSafeAPI()
|
||||
|
||||
@@ -2825,11 +2806,9 @@ Public Class usrCntlKundenuebersicht
|
||||
cBonitaetsauskunft.ba_KundenNr = (kdNr)
|
||||
cBonitaetsauskunft.ba_Datum = Now()
|
||||
|
||||
If company.country = "AT" Then
|
||||
cBonitaetsauskunft.ba_Pruefungstool = "creditsafe AT"
|
||||
Else
|
||||
cBonitaetsauskunft.ba_Pruefungstool = "creditsafe"
|
||||
End If
|
||||
|
||||
cBonitaetsauskunft.ba_Pruefungstool = "creditsafe API"
|
||||
|
||||
|
||||
If (IsNumeric(company.csIndex)) Then
|
||||
company.csIndex = company.csIndex.Replace(".", ",")
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
Imports System.Globalization
|
||||
Imports System.Net
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports com.sun.tools.doclets.internal.toolkit.util
|
||||
Imports Spire.Pdf.Graphics
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
@@ -42,10 +43,20 @@ Public Class usrcntlFiskaluebersicht
|
||||
|
||||
Sub initdgvLieferanten()
|
||||
|
||||
Dim where As String = ""
|
||||
|
||||
Select Case cbxFiskalart._value
|
||||
Case "DE"
|
||||
where = " And FilialenNr = 4811"
|
||||
Case "AT"
|
||||
where = " And FilialenNr = 4805"
|
||||
End Select
|
||||
|
||||
|
||||
Label2.Text = "Top 5 Lieferanten (" & year & ")"
|
||||
With dgvLieferanten
|
||||
.Columns.Clear()
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] as KdNr, MAX(Absender) as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " In([AbsenderKundenNr], [EmpfängerKundenNr], [FrachtführerKundenNr], [VermittlerKundenNr], [EndempfängerKundenNr]) GROUP BY AbsenderKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) [AbsenderKundenNr] 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 ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.Columns("KdNr").Width = 50
|
||||
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("Anzahl").Width = 40
|
||||
@@ -57,10 +68,19 @@ Public Class usrcntlFiskaluebersicht
|
||||
|
||||
Sub initdgvEmfpaenger()
|
||||
|
||||
Dim where As String = ""
|
||||
|
||||
Select Case cbxFiskalart._value
|
||||
Case "DE"
|
||||
where = " And FilialenNr = 4811"
|
||||
Case "AT"
|
||||
where = " And FilialenNr = 4805"
|
||||
End Select
|
||||
|
||||
Label3.Text = "Top 5 Empfänger (" & year & ")"
|
||||
With dgvEmpfaenger
|
||||
.Columns.Clear()
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] 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 & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] 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 ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.Columns("KdNr").Width = 50
|
||||
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("Anzahl").Width = 40
|
||||
@@ -70,10 +90,19 @@ Public Class usrcntlFiskaluebersicht
|
||||
|
||||
Sub initdgvZwischenhaendler()
|
||||
|
||||
Dim where As String = ""
|
||||
|
||||
Select Case cbxFiskalart._value
|
||||
Case "DE"
|
||||
where = " And FilialenNr = 4811"
|
||||
Case "AT"
|
||||
where = " And FilialenNr = 4805"
|
||||
End Select
|
||||
|
||||
Label6.Text = "Top 5 Auftraggeber (" & year & ")"
|
||||
With dgvZwischenh
|
||||
.Columns.Clear()
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT [VermittlerKundenNr] as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch] WHERE year(Abfertigungsdatum) = '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.DataSource() = SQL.loadDgvBySql("SELECT [VermittlerKundenNr] 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 ORDER BY Anzahl DESC ", "FMZOLL")
|
||||
.Columns("KdNr").Width = 50
|
||||
.Columns("Firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("Anzahl").Width = 40
|
||||
@@ -246,40 +275,51 @@ Public Class usrcntlFiskaluebersicht
|
||||
If VM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_datenarchivId))
|
||||
If VM.kdvm_emailId > 0 Then
|
||||
|
||||
Dim MailFile = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_emailId)
|
||||
Dim MailFileVM = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_emailId)
|
||||
|
||||
'Muss von Mail zu PDF konvertiert und dann der Liste angehängt werden!
|
||||
'Dim Mailpath As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("mail.msg", ".msg", True,,)
|
||||
'files.Add(DATENVERVER_OPTIONS.getPDFViaSpirePDF_FromFile(MailFile, Mailpath))
|
||||
If Not System.IO.File.Exists(MailFileVM) Then
|
||||
MsgBox("Die Datei Vollmacht existiert nicht!")
|
||||
Else
|
||||
If MailFileVM.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet)
|
||||
Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG()
|
||||
System.IO.File.Copy(MailFileVM, docPathTMP)
|
||||
Process.Start(docPathTMP)
|
||||
Else
|
||||
Process.Start(MailFileVM)
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
Dim MailFileUVM
|
||||
If UVM IsNot Nothing Then
|
||||
If UVM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_datenarchivId))
|
||||
If UVM.kdvm_emailId > 0 Then
|
||||
MailFileUVM = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_emailId)
|
||||
|
||||
If UVM IsNot Nothing Then
|
||||
If UVM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_datenarchivId))
|
||||
If UVM.kdvm_emailId > 0 Then
|
||||
If Not System.IO.File.Exists(MailFileUVM) Then
|
||||
MsgBox("Die Datei Untervollmacht existiert nicht!")
|
||||
Else
|
||||
If MailFileUVM.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet)
|
||||
Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG()
|
||||
System.IO.File.Copy(MailFileUVM, docPathTMP)
|
||||
Process.Start(docPathTMP)
|
||||
Else
|
||||
Process.Start(MailFileUVM)
|
||||
End If
|
||||
End If
|
||||
|
||||
Dim MailFile = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(UVM.kdvm_emailId)
|
||||
|
||||
'Muss von Mail zu PDF konvertiert und dann der Liste angehängt werden!
|
||||
'Dim Mailpath As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("mail.msg", ".msg", True,,)
|
||||
'files.Add(DATENVERVER_OPTIONS.getPDFViaSpirePDF_FromFile(MailFile, Mailpath))
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
If BA IsNot Nothing Then
|
||||
If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId))
|
||||
End If
|
||||
|
||||
For Each r As DataGridViewRow In dgvUnterlagen.Rows
|
||||
files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value))
|
||||
Next
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
|
||||
End If
|
||||
If BA IsNot Nothing Then
|
||||
If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId))
|
||||
End If
|
||||
For Each r As DataGridViewRow In dgvUnterlagen.Rows
|
||||
files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value))
|
||||
Next
|
||||
VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
|
||||
|
||||
Process.Start(outputFile)
|
||||
|
||||
@@ -287,7 +327,6 @@ Public Class usrcntlFiskaluebersicht
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
|
||||
|
||||
@@ -1511,45 +1511,6 @@ Public Class usrcntlKundeBearbeitenFull
|
||||
|
||||
End If
|
||||
|
||||
'Using UserControl1 As usrcntlCreditsafe = New usrcntlCreditsafe()
|
||||
' Using tmpForm As Form = New Form()
|
||||
' tmpForm.Width = UserControl1.Width
|
||||
' tmpForm.Height = UserControl1.Height + 40
|
||||
' tmpForm.Text = "Creditsafe-Firmensuche"
|
||||
' tmpForm.StartPosition = tmpForm.StartPosition.CenterParent
|
||||
' tmpForm.Controls.Add(UserControl1)
|
||||
' If tmpForm.ShowDialog() = DialogResult.OK Then
|
||||
' txtKurzname.Text = UserControl1.comp.name & ";" & UserControl1.comp.city
|
||||
' txtFirmenname1.Text = UserControl1.comp.name
|
||||
' txtCreditsafe.Text = UserControl1.comp.credissafeId
|
||||
' txtStrasse.Text = UserControl1.comp.street
|
||||
' txtOrt.Text = UserControl1.comp.city
|
||||
' txtPlz.Text = UserControl1.comp.postCode
|
||||
' txtTel.Text = UserControl1.comp.phoneNo
|
||||
|
||||
' If UserControl1.comp.country IsNot Nothing Then
|
||||
' cbxLandKz.changeItem(UserControl1.comp.country.Substring(0, 1))
|
||||
' End If
|
||||
|
||||
|
||||
' If UserControl1.comp.vatNo <> "" Then
|
||||
' cboUSt_UstIdNrLand.changeItem(UserControl1.comp.vatNo.Substring(0, 2))
|
||||
|
||||
' If UserControl1.comp.country <> "" Then
|
||||
' txtUSt_UstIdNr.Text = UserControl1.comp.vatNo.Replace(UserControl1.comp.country, "")
|
||||
' Else
|
||||
' txtUSt_UstIdNr.Text = UserControl1.comp.vatNo
|
||||
' End If
|
||||
' End If
|
||||
|
||||
|
||||
|
||||
' End If
|
||||
|
||||
|
||||
' End Using
|
||||
'End Using
|
||||
|
||||
Cursor = Cursors.Default
|
||||
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user