From 273a0c5b290b85d386a84f7e65268fce23d1abbe Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 6 Dec 2021 11:52:36 +0100 Subject: [PATCH] neu --- SDL.sln | 11 +- SDL/App.config | 7 +- SDL/Classes/cRKSV.vb | 461 ++++++++++++++---- SDL/Formulare/KDFormulare/frmFormulare.vb | 4 +- SDL/My Project/licenses.licx | 6 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_AT.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_CZ.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_DE.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FR.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_FREJUS.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_HUGO.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_IDS.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IT.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_MSE.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_MULTIBOX.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PL.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_PLOSE.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_PLOSE_CZ.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_PLOSE_IT.vb | 2 +- SDL/Reports/MDM/BriefSDl/subrptBriefSDL_SI.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_UTA.vb | 2 +- .../MDM/BriefSDl/subrptBriefSDL_WOELFL.vb | 2 +- ...rtungMWSTOffeneAntraegeMitVorauszahlung.vb | 4 +- ...STOffeneAntraegeMitVorauszahlungDetails.vb | 4 +- SDL/Reports/MDM/rptLeereOBU.vb | 4 +- SDL/Reports/MDM/rptSDLAbrechnungsblatt.vb | 4 +- .../rptSDLBenachrichtigungCZ.vb | 4 +- .../rptSDLBenachrichtigungDE.vb | 4 +- .../rptSDLBenachrichtigungIDS.vb | 4 +- .../rptSDLBenachrichtigungMSE.vb | 4 +- .../rptSDLBenachrichtigungPL.vb | 4 +- .../rptSDLBenachrichtigungUTA.vb | 4 +- ...brptAuswertungUeberfaelligeBestellungen.vb | 4 +- .../Zoll/rptGestellungskontrolleEZOLL.vb | 4 +- SDL/Reports/Zoll/rptKontrolleLKW.vb | 4 +- SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb | 4 +- SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb | 4 +- SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb | 4 +- SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb | 4 +- SDL/Reports/Zoll/rptTGestellungskontrolle.vb | 4 +- .../Zoll/rptTGestellungskontrolleDY.vb | 4 +- SDL/SDL.vbproj | 82 ++-- .../frmNacherfassungNEU.Designer.vb | 18 + .../Nacherfassung/frmNacherfassungNEU.resx | 3 + .../Nacherfassung/frmNacherfassungNEU.vb | 45 +- .../usrCntlSpeditionsBuchSuche.Designer.vb | 69 ++- .../usrCntlSpeditionsBuchSuche.resx | 2 +- .../usrCntlSpeditionsBuchSuche.vb | 88 ++++ .../DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb | 34 ++ .../usrCntlATLAS_NCTS_Adressen.Designer.vb | 103 +++- .../ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb | 2 + .../NCTS/usrCntlATLAS_NCTS_Allg.Designer.vb | 87 ++++ .../ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.vb | 27 + SDL/cProgramFunctions.vb | 55 ++- SDL/frmMain.Designer.vb | 27 +- SDL/frmMain.vb | 16 +- SDL/kassenbuch/frmBelegNeu.vb | 6 +- SDL/kassenbuch/frmFremdbeleg.vb | 2 +- SDL/kassenbuch/frmNacherfassungLeihgeld.vb | 2 +- SDL/kunden/frmKundenblatt.Designer.vb | 2 +- SDL/kunden/usrCntlKundenuebersicht.vb | 11 +- SDL/packages.config | 6 + SDLUPDATER/SDLUPDATER.vbproj | 10 + .../MySearchBox.vb | 2 +- VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb | 71 +++ VERAG_PROG_ALLGEMEIN/Classes/cSDL_LKW.vb | 38 ++ .../DATENSERVER/cDATENSERVER.vb | 24 +- VERAG_PROG_ALLGEMEIN/Google/cGoogleAPI.vb | 64 +++ .../Schnittstellen/cSyska_Interface.vb | 59 ++- .../VERAG_PROG_ALLGEMEIN.vbproj | 6 +- VERAG_PROG_ALLGEMEIN/cAllgemein.vb | 15 + 71 files changed, 1305 insertions(+), 270 deletions(-) create mode 100644 VERAG_PROG_ALLGEMEIN/Google/cGoogleAPI.vb diff --git a/SDL.sln b/SDL.sln index eb74678c..5731dbc2 100644 --- a/SDL.sln +++ b/SDL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30804.86 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31825.309 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}" EndProject @@ -94,8 +94,8 @@ Global {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x86 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.Build.0 = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x86 @@ -116,8 +116,7 @@ Global {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.ActiveCfg = Debug|x86 - {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.ActiveCfg = Debug|x86 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.Build.0 = Debug|x86 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Any CPU.ActiveCfg = Release|x86 diff --git a/SDL/App.config b/SDL/App.config index a1e3df8f..a2e62542 100644 --- a/SDL/App.config +++ b/SDL/App.config @@ -35,12 +35,15 @@ + + + + - + https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/ diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 36b3247f..9ecfb257 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -1,6 +1,7 @@ Imports SDL.RKSVServer Imports System.Drawing.Printing Imports GrapeCity.ActiveReports +Imports VERAG_PROG_ALLGEMEIN.DSFinVKService Public Class cRKSV Shared SQL As New SQL @@ -9,6 +10,8 @@ Public Class cRKSV ' Try + + Dim client As RKSVWcfClient = New RKSVWcfClient() client.Endpoint.Address = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse)) client.Open() @@ -908,6 +911,28 @@ Public Class cRKSV If TESTFLAG Or KASSE.rksvDE_aktiv Then ' WENN für die Kasse die DEUTSCHLAND gilt Dim answer = "" + '*Nullbelg-POS* + Dim POS As New EABelegPositionen + POS.Abfertigungsart = "Sonstiges" + POS.AbfertigungsNr = 10 + POS.Mandant = BELEG.Mandant + POS.Niederlassung = BELEG.Niederlassung + POS.Benutzer = BELEG.Benutzer + POS.BelegDat = BELEG.BelegDat + POS.BelegNr = BELEG.BelegNr + POS.PreislistenPos = -1 + POS.LeistungsNr = 499 + POS.LeistungsBez = "NULLBELEG" + POS.Leistungsbeschreibung = "NULLBELEG" + POS.PreislistenNr = -1 + POS.PreistabellenNr = -1 + POS.Preis = 0 + POS.Anzahl = 1 + POS.Anzahlmultiplikator = 1 + POS.Betrag = 0 + POS.Preisbindung = 0 + BELEG.POS.Add(POS) + If Not cRKSV_DE.insertRKSV_DE(PERSONAL, BELEG, KASSE, RKSV_Beleg_Id, 0, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service If Not TESTBUCHUNG Then KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summe * -1) @@ -939,7 +964,7 @@ Public Class cRKSV If AUTODRUCK Then Dim pName = "" - For Each sPrinter As String In PrinterSettings.InstalledPrinters + For Each sPrinter As String In System.Drawing.Printing.PrinterSettings.InstalledPrinters If sPrinter = "AUTODRUCK_MAIL" Then pName = sPrinter : Exit For Next If pName = "" Then @@ -1632,138 +1657,138 @@ Public Class cRKSV_DE__TEST End Function - Shared Function insertRKSV_DE(ByVal kasse As cRKSV_Kasse, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean - MsgBox("123") + 'Shared Function insertRKSV_DE(ByVal kasse As cRKSV_Kasse, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean + ' MsgBox("123") - Try + ' Try - ' COM-Objekt anlegen + ' ' COM-Objekt anlegen - ' Dim licenseKey As String = kasse.rksv_DE_license '"07.11.2020;MEUCIQDfTvMPWQo4IVvTtuTbU9YHNwJ7EdMbogfGqmAp+rdw4gIgPJoEDE0OCfac/nCOKdksWvOZq+xvkFoYI0HFxJPkldU=" - ' Dim TSESerialNumber As String = "77A9D25F044A89E87578A8CD52D2A92564CC09214CC6448465414008D31C1CF1" - Dim m_ksv = New ItgKsV.KsVCom() - 'Dim m_ksv As ItgKsV.KsVCom = New ItgKsV.KsVCom() - ' Dim result As Integer = m_ksv.InitialiseLibrary("F:", "SwissbitDemo", "12345", licenseKey) + ' ' Dim licenseKey As String = kasse.rksv_DE_license '"07.11.2020;MEUCIQDfTvMPWQo4IVvTtuTbU9YHNwJ7EdMbogfGqmAp+rdw4gIgPJoEDE0OCfac/nCOKdksWvOZq+xvkFoYI0HFxJPkldU=" + ' ' Dim TSESerialNumber As String = "77A9D25F044A89E87578A8CD52D2A92564CC09214CC6448465414008D31C1CF1" + ' Dim m_ksv = New ItgKsV.KsVCom() + ' 'Dim m_ksv As ItgKsV.KsVCom = New ItgKsV.KsVCom() + ' ' Dim result As Integer = m_ksv.InitialiseLibrary("F:", "SwissbitDemo", "12345", licenseKey) - MsgBox(kasse.rksv_ipAdresse & " --- " & kasse.rksv_DE_TSE_Serial & " --- " & kasse.rksv_DE_apiToken & " --- " & kasse.rksv_DE_user & " --- " & kasse.rksv_DE_pwd & " --- " & kasse.rksv_DE_license) + ' MsgBox(kasse.rksv_ipAdresse & " --- " & kasse.rksv_DE_TSE_Serial & " --- " & kasse.rksv_DE_apiToken & " --- " & kasse.rksv_DE_user & " --- " & kasse.rksv_DE_pwd & " --- " & kasse.rksv_DE_license) - Dim result As Integer = m_ksv.InitialiseLibraryLan(kasse.rksv_ipAdresse, kasse.rksv_DE_TSE_Serial, kasse.rksv_DE_apiToken, kasse.rksv_DE_user, kasse.rksv_DE_pwd, kasse.rksv_DE_license) '--> ClientId/User "Admin" mit KsVCom Demo registriert + ' Dim result As Integer = m_ksv.InitialiseLibraryLan(kasse.rksv_ipAdresse, kasse.rksv_DE_TSE_Serial, kasse.rksv_DE_apiToken, kasse.rksv_DE_user, kasse.rksv_DE_pwd, kasse.rksv_DE_license) '--> ClientId/User "Admin" mit KsVCom Demo registriert - If result <> &H0 Then - MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - Return False - End If + ' If result <> &H0 Then + ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' Return False + ' End If - '' Setup bei erstmaliger Verwendung der Swissbit-TSE !!! + ' '' Setup bei erstmaliger Verwendung der Swissbit-TSE !!! - 'result = m_ksv.SetupTSEForFirstUse("123456", "12345", "98765", "SwissbitDemo") + ' 'result = m_ksv.SetupTSEForFirstUse("123456", "12345", "98765", "SwissbitDemo") - 'If result <> &H0 Then - ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - 'Else - ' MessageBox.Show("TSE setup succeeded.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information) - 'End If + ' 'If result <> &H0 Then + ' ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' 'Else + ' ' MessageBox.Show("TSE setup succeeded.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information) + ' 'End If - ' BeginTransaction: für jede neue Rechnung wird eine Transaktion gestartet + ' ' BeginTransaction: für jede neue Rechnung wird eine Transaktion gestartet - Dim transactionNumber As Long = 0 - result = m_ksv.StartTransaction(transactionNumber) + ' Dim transactionNumber As Long = 0 + ' result = m_ksv.StartTransaction(transactionNumber) - If result <> &H0 Then - MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - Return False - End If + ' If result <> &H0 Then + ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' Return False + ' End If - ' UpdateTransaction: processData bleibt leer + ' ' UpdateTransaction: processData bleibt leer - result = m_ksv.UpdateTransaction(transactionNumber, "", "KassenBeleg-V1") + ' result = m_ksv.UpdateTransaction(transactionNumber, "", "KassenBeleg-V1") - If result <> &H0 Then - MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If + ' If result <> &H0 Then + ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If - ' FinishTransaction: Abschluss einer Rechnung, processData nach vorgegebenem Format + ' ' FinishTransaction: Abschluss einer Rechnung, processData nach vorgegebenem Format - result = m_ksv.FinishTransaction(transactionNumber, getBelegSting_BAR(summeBRUTTO, steuerSchluessel), "KassenBeleg-V1") + ' result = m_ksv.FinishTransaction(transactionNumber, getBelegSting_BAR(summeBRUTTO, steuerSchluessel), "KassenBeleg-V1") - If result <> &H0 Then - MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - End If + ' If result <> &H0 Then + ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' End If - ' QR-Code und weitere Werte, die auf der Rechnung angedruckt werden müssen + ' ' QR-Code und weitere Werte, die auf der Rechnung angedruckt werden müssen - ' QR-Code wird als base64 kodiertes bitmap geliefert + ' ' QR-Code wird als base64 kodiertes bitmap geliefert - Dim qrCode As String = String.Empty + ' Dim qrCode As String = String.Empty - ' QR-Code Inhalt für die Ablage in der Datenbank, falls eine Rechnung nochmals gedruckt werden muss + ' ' QR-Code Inhalt für die Ablage in der Datenbank, falls eine Rechnung nochmals gedruckt werden muss - Dim qrCodeContent As String = String.Empty - m_ksv.GetLastReceiptQrCode(qrCode) - m_ksv.GetLastReceiptQrCodeContent(qrCodeContent) - Dim sTransactionNumber As String = String.Empty - Dim serialNumber As String = String.Empty - Dim signature As String = String.Empty - Dim sigCounter As String = String.Empty - Dim dtStartTransaction As Date = Date.MinValue - Dim dtFinishTransaction As Date = Date.MinValue - m_ksv.GetLastReceiptValues(sTransactionNumber, serialNumber, signature, dtStartTransaction, dtFinishTransaction, sigCounter) + ' Dim qrCodeContent As String = String.Empty + ' m_ksv.GetLastReceiptQrCode(qrCode) + ' m_ksv.GetLastReceiptQrCodeContent(qrCodeContent) + ' Dim sTransactionNumber As String = String.Empty + ' Dim serialNumber As String = String.Empty + ' Dim signature As String = String.Empty + ' Dim sigCounter As String = String.Empty + ' Dim dtStartTransaction As Date = Date.MinValue + ' Dim dtFinishTransaction As Date = Date.MinValue + ' m_ksv.GetLastReceiptValues(sTransactionNumber, serialNumber, signature, dtStartTransaction, dtFinishTransaction, sigCounter) - QR_CodeString = qrCode - LastJWS = signature - '' Anzeige der gestarteten/noch möglichen Transaktionen + ' QR_CodeString = qrCode + ' LastJWS = signature + ' '' Anzeige der gestarteten/noch möglichen Transaktionen - 'Dim maxTransactions As Integer = 0 - 'Dim openTransactions As Integer = 0 - 'm_ksv.GetMaxStartedTransactions(maxTransactions) - 'm_ksv.GetStartedTransactions(openTransactions) - 'Dim startedTransactions As Integer() = Nothing - 'result = m_ksv.GetStartedTransactionNumbers(startedTransactions) + ' 'Dim maxTransactions As Integer = 0 + ' 'Dim openTransactions As Integer = 0 + ' 'm_ksv.GetMaxStartedTransactions(maxTransactions) + ' 'm_ksv.GetStartedTransactions(openTransactions) + ' 'Dim startedTransactions As Integer() = Nothing + ' 'result = m_ksv.GetStartedTransactionNumbers(startedTransactions) - 'If result <> &H0 Then - ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - 'End If + ' 'If result <> &H0 Then + ' ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' 'End If - '' Export der TSE-Daten im TAR-Format + ' '' Export der TSE-Daten im TAR-Format - 'result = m_ksv.ExportAsTarFile("d:\export.tar") + ' 'result = m_ksv.ExportAsTarFile("d:\export.tar") - 'If result <> 0 Then - ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - 'End If + ' 'If result <> 0 Then + ' ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' 'End If - '' Bibliothek aufräumen, andernfalls wird ein power-cycle der TSE erforderlich um sie wieder einsetzen zu können + ' '' Bibliothek aufräumen, andernfalls wird ein power-cycle der TSE erforderlich um sie wieder einsetzen zu können - ''result = CSharpImpl.__Assign(,, m_ksv.CleanupLibrary()) - 'result = m_ksv.CleanupLibrary() + ' ''result = CSharpImpl.__Assign(,, m_ksv.CleanupLibrary()) + ' 'result = m_ksv.CleanupLibrary() - 'If result <> 0 Then - ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - 'End If + ' 'If result <> 0 Then + ' ' MessageBox.Show(m_ksv.StringifyErrorCode(result), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' 'End If - Catch ex As Exception - MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace) - End Try - Return False - End Function + ' Catch ex As Exception + ' MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace) + ' End Try + ' Return False + 'End Function End Class @@ -1809,17 +1834,15 @@ Public Class cRKSV_DE 'Return getRKSVLink(kasse.rksv_bez) End Function - Shared Function insertRKSV_DE(PERSONAL As cPersonal, BELEG As EABeleg, ByVal kasse As cRKSV_Kasse, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String, Optional storno As Integer = 0) As Boolean + Shared Function insertRKSV_DE_ORIG(PERSONAL As cPersonal, BELEG As EABeleg, ByVal kasse As cRKSV_Kasse, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String, Optional storno As Integer = 0) As Boolean Try - Dim cashbox As String = kasse.rksv_KassaGuid '"VERAG_GMBH_KASSE_01" "KASSA 001" 'Dim endpoint = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse)) ' Dim m_com As VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient = New VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient("DSFinVKService", endpoint) '"http://ymgk028055.verag.ost.dmn:8733/DSFinVKService") - Dim m_com As VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient = New VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient() 'PROBLEM?? - + Dim m_com As DSFinVKServerClient = New DSFinVKServerClient() 'PROBLEM?? ' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox) @@ -2054,6 +2077,272 @@ Public Class cRKSV_DE Return False End Function + Shared Function insertRKSV_DE(PERSONAL As cPersonal, BELEG As EABeleg, ByVal kasse As cRKSV_Kasse, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String, Optional storno As Integer = 0) As Boolean + + Try + + + Dim cashbox As String = kasse.rksv_KassaGuid '"VERAG_GMBH_KASSE_01" "KASSA 001" + 'Dim endpoint = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse)) + ' Dim m_com As VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient = New VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient("DSFinVKService", endpoint) '"http://ymgk028055.verag.ost.dmn:8733/DSFinVKService") + + Dim m_com As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer() 'PROBLEM?? + + Dim [error] As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.ErrorCode + Dim InitializeLibraryResultSpecified As Boolean + ' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox) + m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified) + + MsgBox("1: " & [error]) + + If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then + MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + Return False + End If + + MsgBox("2") + Dim BON_ID As Integer = 0 + Dim BON_IDSpecified = False + Dim GetNextBON_IDResultSpecified = False + m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified) + MsgBox("3: " & [error]) + + If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then + MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + Return False + End If + + 'Dim BON_NR As Integer = 0 + '[error] = m_com.GetNextBON_NR(cashbox, BON_NR) + + 'If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then + ' MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + ' Return False + 'End If + + + MsgBox("4") + + 'Rechnung beginnen + + Dim bonkopfBegin As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin() + + bonkopfBegin.Z_KASSE_ID = cashbox + + bonkopfBegin.BEDIENER_ID = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID 'tbBEDIENER_ID.Text + + bonkopfBegin.BEDIENER_NAME = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME 'tbBEDIENER_NAME.Text + + bonkopfBegin.BON_ID = BON_ID.ToString() + + bonkopfBegin.BON_NAME = "" 'tbBON_NAME.Text + + bonkopfBegin.BON_NOTIZ = "" 'tbBON_NOTIZ.Text + + bonkopfBegin.BON_NR = BON_ID + + bonkopfBegin.BON_STORNO = storno 'If(cbBON_STORNO.Checked, "1", "0") + + bonkopfBegin.BON_TYP = "Beleg" 'cmbBON_TYP.SelectedItem.ToString() + + bonkopfBegin.KUNDE_ID = "" 'tbKUNDE_ID.Text + + bonkopfBegin.KUNDE_LAND = "" 'tbKUNDE_LAND.Text + + bonkopfBegin.KUNDE_NAME = "" 'tbKUNDE_NAME.Text + + bonkopfBegin.KUNDE_ORT = "" 'tbKUNDE_ORT.Text + + bonkopfBegin.KUNDE_PLZ = "" 'tbKUNDE_PLZ.Text + + bonkopfBegin.KUNDE_STRASSE = "" ' tbKUNDE_STRASSE.Text + + bonkopfBegin.KUNDE_TYP = "" ' tbKUNDE_TYP.Text + + bonkopfBegin.KUNDE_USTID = "" ' tbKUNDE_USTID.Text + + bonkopfBegin.TERMINAL_ID = "" 'tbTERMINAL_ID.Text + + Dim transactionNumber As Integer = 0 + Dim transactionNumberSpecified As Boolean + + Dim BeginReceiptResultSpecified As Boolean + m_com.BeginReceipt(cashbox, bonkopfBegin, transactionNumber, transactionNumberSpecified, [error], BeginReceiptResultSpecified) + + MsgBox("5 ANZ: " & BELEG.POS.Count) + Dim cntZeile = 1 + Dim GES_BRUTTO As Double = 0 + For Each POS In BELEG.POS + + 'Bonposition hinzufügen + Dim position As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition() + + position.AGENTUR_ID = -1 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["AGENTUR_ID"].Value) + + position.ARTIKELTEXT = POS.LeistungsBez 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["ARTIKELTEXT"].Value) + + position.ART_NR = POS.LeistungsNr ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["ART_NR"].Value) + + position.BON_ID = Convert.ToString(BON_ID) + + position.EINHEIT = "Stk." ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["EINHEIT"].Value) + + position.FAKTOR = 1 ' Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["FAKTOR"].Value) + + position.GTIN = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GTIN"].Value) + + position.GUTSCHEIN_NR = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GUTSCHEIN_NR"].Value) + + position.GV_NAME = "" ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GV_NAME"].Value) + + position.GV_TYP = "Umsatz" ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GV_TYP"].Value) + + position.INHAUS = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["INHAUS"].Value) + + position.MENGE = POS.Anzahl 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["MENGE"].Value) + + position.POS_TERMINAL_ID = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_TERMINAL_ID"].Value) + + position.POS_ZEILE = cntZeile 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_ZEILE"].Value) + + position.P_STORNO = storno ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["P_STORNO"].Value) + + position.STK_BR = POS.Preis 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["STK_BR"].Value) + + position.WARENGR = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["WARENGR"].Value) + + position.WARENGR_ID = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["WARENGR_ID"].Value) + + position.Z_KASSE_ID = cashbox 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["Z_KASSE_ID"].Value) + + ' Beträge der Position + + Dim position_vat = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition_Ust() + + position_vat.BON_ID = position.BON_ID + + position_vat.POS_ZEILE = position.POS_ZEILE + + Dim steuersatzID = 1 + Dim steuersatz As Double = SQL.getValueTxtBySql("SELECT [Steuersatz] FROM [tblSteuersätze] where nr='" & BELEG.Steuerschlüssel & "'", "FMZOLL") + Select Case steuersatz + Case 0.19 : steuersatzID = 1 + Case 0.07 : steuersatzID = 2 + Case 0.00 : steuersatzID = 6 + End Select + + position_vat.UST_SCHLUESSEL = steuersatzID 'm_com.GetTaxIds(cashbox,) 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["UST_SCHLUESSEL"].Value) + Dim steuerBetrag = POS.Betrag * position_vat.UST_SCHLUESSEL + position_vat.POS_BRUTTO = POS.Betrag + steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_BRUTTO"].Value) + + position_vat.POS_NETTO = POS.Betrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_NETTO"].Value) + + position_vat.POS_UST = steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_UST"].Value) + + Dim AddPositionToReceiptResultSpecified As Boolean + m_com.AddPositionToReceipt(cashbox, position, position_vat, transactionNumber, transactionNumberSpecified, [error], AddPositionToReceiptResultSpecified) + cntZeile += 1 + GES_BRUTTO += position_vat.POS_BRUTTO + + Next + MsgBox("6") + + 'Rechnung abschließen + + Dim bonkopfFinish As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfFinish = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfFinish() + + bonkopfFinish.Z_KASSE_ID = cashbox + + bonkopfFinish.BON_ID = BON_ID + + + + If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then + bonkopfFinish.UMS_BRUTTO = 0.00 + End If + + + bonkopfFinish.PROCESS_TYPE = "Kassenbeleg-V1" + + bonkopfFinish.payment_currencies = {"EUR"} + + bonkopfFinish.payment_types = {"Bar"} + + bonkopfFinish.payment_per_currency = {119.0} + + Dim FinishReceiptResult As Boolean + Dim FinishReceiptResultSpecified As Boolean + m_com.FinishReceipt(cashbox, bonkopfFinish, transactionNumber, FinishReceiptResult, [error], FinishReceiptResultSpecified) + + ' Kassenabschluss anlegen über alle noch nicht abgeschlossenen Rechnungen zu dieser Kasse + + ' Error = m_com.CreateCashpointClosing(cashbox) + + ' ' DSFinV-K-Export + + ' Int from = 0 + + 'Int to = 10 + + 'Dim ret = m_com.ExportCSVFiles(from, to, tbSelectedFolder.Text, tbZipName.Text, True, True, + + 'true, true, true, true, true, true, + + 'true, true, true, true, + + 'true, true, true, true, true, + + 'true, true, true); + + 'If (ret == ErrorCode.OK) Then + + '{ + + 'MessageBox.Show("Die CSV Dateien wurden im Ordner " + tbSelectedFolder.Text + " angelegt und in die Zip-Datei " + tbZipName.Text + " gepackt.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information); + + '} + + 'Else + + '{ + + 'MessageBox.Show("Beim exportieren der CSV-Dateien ging etwas schief:\r\n" + ret.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + + '} + MsgBox("7") + + Dim transactionNumberRet As String + Dim serialNumber As String + Dim signature As String + Dim transactionStart As Date + Dim transactionFinish As Date + Dim sigCounter As String + Dim transactionStartSpecified As Boolean + Dim transactionFinishSpecified As Boolean + Dim GetLastReceiptValuesResultSpecified As Boolean + ' + m_com.GetLastReceiptValues(cashbox, transactionNumberRet, serialNumber, signature, transactionStart, transactionStartSpecified, transactionFinish, transactionFinishSpecified, sigCounter, [error], GetLastReceiptValuesResultSpecified) + + MsgBox("8") + + Dim qrCode As String = String.Empty + Dim mimeType As String = String.Empty + Dim GetLastReceiptQrCodeResult As Boolean + Dim GetLastReceiptQrCodeResultSpecified As Boolean + m_com.GetLastReceiptQrCode(cashbox, qrCode, mimeType, GetLastReceiptQrCodeResult, GetLastReceiptQrCodeResultSpecified) + + QR_CodeString = qrCode + LastJWS = signature + + + MsgBox("9") + + Catch ex As Exception + MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace) + End Try + Return False + End Function + 'Shared Function insertRKSV_DE(ByVal kasse As cRKSV_Kasse, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean ' Try diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index cea3e50f..81967536 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1071,7 +1071,7 @@ Public Class frmFormulare ' alle installierten Drucker ermitteln und ' in in ein ArrayList-Objekt speichern Dim sPrinters As New ArrayList - For Each sPrinter As String In PrinterSettings.InstalledPrinters + For Each sPrinter As String In System.Drawing.Printing.PrinterSettings.InstalledPrinters sPrinters.Add(sPrinter) Next @@ -2797,7 +2797,7 @@ Public Class FormularManagerNEU 'VE_ für Verpflichtungserklärung Dim barcodeLKW As Image = Code128Rendering.MakeBarcodeImage("VE-" & If(usrCntl.AVISOID Is Nothing, 0, usrCntl.AVISOID) & "", 1, True, 20) Dim bc As New List(Of VERAG_PROG_ALLGEMEIN.barcodeToPdf) - Dim b = New VERAG_PROG_ALLGEMEIN.barcodeToPdf(barcodeLKW, 20, 200, 20, 20, 1, Drawing.RotateFlipType.Rotate270FlipNone) + Dim b = New VERAG_PROG_ALLGEMEIN.barcodeToPdf(barcodeLKW, 20, 200, 20, 20, 1, System.Drawing.RotateFlipType.Rotate270FlipNone) bc.Add(b) Dim path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(nameDispo & ".pdf", ".pdf", True, False) diff --git a/SDL/My Project/licenses.licx b/SDL/My Project/licenses.licx index 7926021c..7e531858 100644 --- a/SDL/My Project/licenses.licx +++ b/SDL/My Project/licenses.licx @@ -1,4 +1,2 @@ -GrapeCity.ActiveReports.Export.Excel.Section.XlsExport, GrapeCity.ActiveReports.Export.Excel.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff -GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff -GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff -GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff +GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff +GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_AT.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_AT.vb index d0c9c9b4..13d7867e 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_AT.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_AT.vb @@ -38,7 +38,7 @@ Public Class subrptBriefSDL_AT 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_CZ.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_CZ.vb index fd73ec0e..7d5c776e 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_CZ.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_CZ.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_cz 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_DE.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_DE.vb index 6f7051f6..2a0fe188 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_DE.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_DE.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_MSE 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FR.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FR.vb index 7fc482fd..2f71ce91 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FR.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FR.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_FR 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FREJUS.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FREJUS.vb index dfddb0d2..04750b8c 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FREJUS.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_FREJUS.vb @@ -35,7 +35,7 @@ Public Class subrptBriefSDL_FREJUS 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_HUGO.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_HUGO.vb index d41cdb14..789532bd 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_HUGO.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_HUGO.vb @@ -36,7 +36,7 @@ Public Class subrptBriefSDL_HUGO 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IDS.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IDS.vb index dace7118..14fda9bc 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IDS.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IDS.vb @@ -35,7 +35,7 @@ Public Class subrptBriefSDL_IDS 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IT.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IT.vb index 0084fe92..8ed5ff41 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IT.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_IT.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_IT 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MSE.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MSE.vb index a1d05a8c..4615b3c8 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MSE.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MSE.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_DE 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MULTIBOX.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MULTIBOX.vb index e2a8d1ca..bafdcd80 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MULTIBOX.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_MULTIBOX.vb @@ -36,7 +36,7 @@ Public Class subrptBriefSDL_MULTIBOX 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PL.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PL.vb index 70b98481..32c49d0e 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PL.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PL.vb @@ -35,7 +35,7 @@ Public Class subrptBriefSDL_PL 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE.vb index be15ca91..a98e2b06 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_PLOSE 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_CZ.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_CZ.vb index 34ac7b51..233a6656 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_CZ.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_CZ.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_PLOSE_CZ 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_IT.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_IT.vb index 4bf8e6f6..04d99de5 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_IT.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_IT.vb @@ -34,7 +34,7 @@ Public Class subrptBriefSDL_PLOSE_IT 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_SI.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_SI.vb index 661c3351..c7927af7 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_SI.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_SI.vb @@ -36,7 +36,7 @@ Public Class subrptBriefSDL_SI 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_UTA.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_UTA.vb index 77a0bbea..9190edfc 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_UTA.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_UTA.vb @@ -35,7 +35,7 @@ Public Class subrptBriefSDL_UTA 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_WOELFL.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_WOELFL.vb index c9f21e19..f847fe29 100644 --- a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_WOELFL.vb +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_WOELFL.vb @@ -32,7 +32,7 @@ Public Class subrptBriefSDL_WOELFL 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else Detail.BackColor = Color.FromArgb(250, 250, 250) End If diff --git a/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlung.vb b/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlung.vb index 10c0b78f..29723918 100644 --- a/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlung.vb +++ b/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlung.vb @@ -66,9 +66,9 @@ Public Class rptAuswertungMWSTOffeneAntraegeMitVorauszahlung 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = Color.WhiteSmoke End If End Sub End Class diff --git a/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlungDetails.vb b/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlungDetails.vb index 9b486ea6..b75bfca9 100644 --- a/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlungDetails.vb +++ b/SDL/Reports/MDM/rptAuswertungMWSTOffeneAntraegeMitVorauszahlungDetails.vb @@ -70,9 +70,9 @@ Public Class rptAuswertungMWSTOffeneAntraegeMitVorauszahlungDetails 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub End Class diff --git a/SDL/Reports/MDM/rptLeereOBU.vb b/SDL/Reports/MDM/rptLeereOBU.vb index f41cdc29..2525a9d2 100644 --- a/SDL/Reports/MDM/rptLeereOBU.vb +++ b/SDL/Reports/MDM/rptLeereOBU.vb @@ -32,9 +32,9 @@ Public Class rptLeereOBU 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLAbrechnungsblatt.vb b/SDL/Reports/MDM/rptSDLAbrechnungsblatt.vb index 3a0ab8df..8fbf1d07 100644 --- a/SDL/Reports/MDM/rptSDLAbrechnungsblatt.vb +++ b/SDL/Reports/MDM/rptSDLAbrechnungsblatt.vb @@ -67,9 +67,9 @@ Public Class rptSDLAbrechnungsblatt 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = System.Drawing.Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungCZ.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungCZ.vb index ec38b931..296f52e5 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungCZ.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungCZ.vb @@ -77,9 +77,9 @@ Public Class rptSDLBenachrichtigungCZ 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungDE.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungDE.vb index 58e1e222..dc292b69 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungDE.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungDE.vb @@ -117,9 +117,9 @@ Public Class rptSDLBenachrichtigungDE 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungIDS.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungIDS.vb index 57c29c6d..4e6db84a 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungIDS.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungIDS.vb @@ -86,9 +86,9 @@ Public Class rptSDLBenachrichtigungids 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = System.Drawing.Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungMSE.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungMSE.vb index b30397db..a31a699e 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungMSE.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungMSE.vb @@ -85,9 +85,9 @@ Public Class rptSDLBenachrichtigungMSE 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = System.Drawing.Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungPL.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungPL.vb index 60bed6d6..a2fa0591 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungPL.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungPL.vb @@ -90,9 +90,9 @@ Public Class rptSDLBenachrichtigungPL 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungUTA.vb b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungUTA.vb index 3a53ab75..632796ab 100644 --- a/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungUTA.vb +++ b/SDL/Reports/MDM/rptSDLBenachrichtigung/rptSDLBenachrichtigungUTA.vb @@ -92,9 +92,9 @@ Public Class rptSDLBenachrichtigungUTA 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Shape.BackColor = Drawing.Color.White + Shape.BackColor = System.Drawing.Color.White Else - Shape.BackColor = Drawing.Color.WhiteSmoke + Shape.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/MDM/subrptAuswertungUeberfaelligeBestellungen.vb b/SDL/Reports/MDM/subrptAuswertungUeberfaelligeBestellungen.vb index c9bd9c3d..627157c4 100644 --- a/SDL/Reports/MDM/subrptAuswertungUeberfaelligeBestellungen.vb +++ b/SDL/Reports/MDM/subrptAuswertungUeberfaelligeBestellungen.vb @@ -34,9 +34,9 @@ Public Class subrptAuswertungUeberfaelligeBestellungen 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub End Class diff --git a/SDL/Reports/Zoll/rptGestellungskontrolleEZOLL.vb b/SDL/Reports/Zoll/rptGestellungskontrolleEZOLL.vb index 09f92334..b38d08a4 100644 --- a/SDL/Reports/Zoll/rptGestellungskontrolleEZOLL.vb +++ b/SDL/Reports/Zoll/rptGestellungskontrolleEZOLL.vb @@ -92,9 +92,9 @@ Public Class rptGestellungskontrolleEZOLL 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptKontrolleLKW.vb b/SDL/Reports/Zoll/rptKontrolleLKW.vb index ce333daf..191974d0 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW.vb @@ -158,9 +158,9 @@ Public Class rptKontrolleLKW 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb index ee0ae485..6d86ea66 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb @@ -138,9 +138,9 @@ Public Class rptKontrolleLKW_Dakosy End If 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb index 9b990c14..4c41d5d8 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb @@ -240,9 +240,9 @@ Public Class rptKontrolleLKW_NCTSTR 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb b/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb index 6aeaac7b..2030f059 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb @@ -145,9 +145,9 @@ Public Class rptKontrolleLKW_TELOTEC End If 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb b/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb index 7887f785..3ba60728 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb @@ -128,9 +128,9 @@ Public Class rptKontrolleLKW_Zolaris End If 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptTGestellungskontrolle.vb b/SDL/Reports/Zoll/rptTGestellungskontrolle.vb index f0a6de8c..b6b217fd 100644 --- a/SDL/Reports/Zoll/rptTGestellungskontrolle.vb +++ b/SDL/Reports/Zoll/rptTGestellungskontrolle.vb @@ -89,9 +89,9 @@ Public Class rptTGestellungskontrolle 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = System.Drawing.Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = System.Drawing.Color.WhiteSmoke End If End Sub diff --git a/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb b/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb index d41b3a22..250f555e 100644 --- a/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb +++ b/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb @@ -88,9 +88,9 @@ Public Class rptTGestellungskontrolleDY 'Abwechselnd grauen und weißen Hintergrund If (dummycount Mod 2) = 0 Then - Detail.BackColor = Drawing.Color.White + Detail.BackColor = Color.White Else - Detail.BackColor = Drawing.Color.WhiteSmoke + Detail.BackColor = Color.WhiteSmoke End If End Sub diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 43bbf3d8..5ea2d194 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -87,10 +87,10 @@ False - ..\..\..\..\RKSV DE\BouncyCastle.Crypto.dll + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll - - ..\..\..\dll\ClosedXML.dll + + ..\..\..\AVISO\Aviso\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll ..\..\..\AVISO\Aviso\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll @@ -99,10 +99,11 @@ False ..\..\..\dll\SharpSSH\DiffieHellman.dll - - False - C:\Program Files (x86)\Open XML SDK\V2.5\lib\DocumentFormat.OpenXml.dll - True + + ..\..\..\AVISO\Aviso\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + + ..\..\..\AVISO\Aviso\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll False @@ -111,20 +112,45 @@ ..\..\..\..\RKSV DE\Gma.QrCodeNet.Encoding.dll - - - - - - - - - - - - - - + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Chart.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Design.Win.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Excel.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Image.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Word.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Xml.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Common.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.Documents.Common.dll + ..\packages\IKVM.8.0.5449.1\lib\IKVM.AWT.WinForms.dll @@ -215,19 +241,14 @@ ..\..\..\dll\itextsharp.pdfa.dll - - ..\..\..\dll\ITGRKSVCom.dll - C:\Users\DEVELOPER1\Desktop\RK_ITG_TEST\c#\Tester\bin\x86\Release\jose-jwt.dll - - ..\..\..\..\RKSV DE\KsVCom.dll - ..\..\..\AVISO\Aviso\packages\LiveCharts.0.6.7.0\lib\net40\LiveCharts.dll True + True @@ -272,6 +293,12 @@ + + ..\..\..\AVISO\Aviso\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + + + ..\..\..\AVISO\Aviso\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + @@ -308,7 +335,6 @@ - diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb index 026cf2a3..893e7002 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.Designer.vb @@ -230,6 +230,8 @@ Partial Class frmNacherfassungNEU Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.KopierenZwischenablageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnl.SuspendLayout() Me.Panel3.SuspendLayout() Me.GroupBox4.SuspendLayout() @@ -241,6 +243,7 @@ Partial Class frmNacherfassungNEU Me.Panel2.SuspendLayout() Me.pnlZOll.SuspendLayout() Me.Panel4.SuspendLayout() + Me.ContextMenuStrip2.SuspendLayout() Me.SuspendLayout() ' 'lblAbfertigungsdatum @@ -3260,6 +3263,18 @@ Partial Class frmNacherfassungNEU Me.DataGridViewTextBoxColumn5.HeaderText = "Anzahl" Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" ' + 'ContextMenuStrip2 + ' + Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenZwischenablageToolStripMenuItem}) + Me.ContextMenuStrip2.Name = "ContextMenuStrip2" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(218, 48) + ' + 'KopierenZwischenablageToolStripMenuItem + ' + Me.KopierenZwischenablageToolStripMenuItem.Name = "KopierenZwischenablageToolStripMenuItem" + Me.KopierenZwischenablageToolStripMenuItem.Size = New System.Drawing.Size(217, 22) + Me.KopierenZwischenablageToolStripMenuItem.Text = "Kopieren (Zwischenablage)" + ' 'frmNacherfassungNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3290,6 +3305,7 @@ Partial Class frmNacherfassungNEU Me.pnlZOll.PerformLayout() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() + Me.ContextMenuStrip2.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -3497,4 +3513,6 @@ Partial Class frmNacherfassungNEU Public WithEvents cboAbklärungFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Button4 As Button Friend WithEvents cbxEIDR As CheckBox + Friend WithEvents ContextMenuStrip2 As ContextMenuStrip + Friend WithEvents KopierenZwischenablageToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.resx b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.resx index 207bd2bb..545d47b5 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.resx +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.resx @@ -262,6 +262,9 @@ 174, 17 + + 297, 17 + 32 diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index 41f6c307..1a4ba664 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -324,7 +324,7 @@ Public Class frmNacherfassungNEU If .RowCount > 0 Then .Rows.Clear() If (txtAbfertigungsnummer.Text.Trim <> "" AndAlso IsNumeric(txtAbfertigungsnummer.Text) AndAlso txtAbfertigungsnummer.Text > 0) And (cboFiliale._value.Trim <> "" AndAlso IsNumeric(cboFiliale._value) AndAlso cboFiliale._value > 0) Then - .DataSource = SQL.loadDgvBySql("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and FilialenNr>0 and AbfertigungsNr>0) OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg,tblEABelegnummer.Mandant, tblEABelegnummer.Niederlassung FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and FilialenNr>0 and AbfertigungsNr>0) OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL") 'AND UnterNr='" & SPEDITIONSBUCH.UnterNr & "' --> Unternr gibts ned 'MsgBox("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer FROM [tblEABelegnummer] where AbfertigungsNr='" & txtAbfertigungsnummer.Text & "' and FilialenNr='" & cboFiliale._value & "' and storniert=0 and gebuchtstorno=0 order by rksv_BelegId") .Columns("rksv_BelegId").HeaderText = "Beleg-Id" @@ -336,6 +336,8 @@ Public Class frmNacherfassungNEU .Columns("rksv_umsatz").DefaultCellStyle.Format = "C" .Columns("BelegNr").Visible = False .Columns("BelegDat").Visible = False + .Columns("Mandant").Visible = False + .Columns("Niederlassung").Visible = False .Columns("Benutzer").Visible = False .Columns("LKW_Beleg").HeaderText = "LKW" .Columns("LKW_Beleg").Width = 35 @@ -1450,7 +1452,9 @@ Public Class frmNacherfassungNEU Dim r As DataGridViewRow = dgvBelege.SelectedRows(0) Dim PERSONALTmp As SDL.cPersonal = sqlTMP.getPersonalById(r.Cells("Benutzer").Value) - Dim B As New SDL.EABeleg("LOAD", PERSONALTmp.Mandant, PERSONALTmp.Niederlassung, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value) + ' Dim B As New SDL.EABeleg("LOAD", PERSONALTmp.Mandant, PERSONALTmp.Niederlassung, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value) + Dim B As New SDL.EABeleg("LOAD", r.Cells("Mandant").Value, r.Cells("Niederlassung").Value, PERSONALTmp.ID, r.Cells("BelegNr").Value, r.Cells("BelegDat").Value) + openBELEG(PERSONALTmp, B) End If ElseIf tbcntrRg.SelectedTab Is TabPage2 Then @@ -1501,14 +1505,14 @@ Public Class frmNacherfassungNEU Case "E" 'If B.storniert Then MsgBox("Der Beleg wurde bereits storiniert!") : Exit Sub - Dim frmBeleg As New SDL.frmFremdbeleg(PERSONAL, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) + Dim frmBeleg As New SDL.frmFremdbeleg(PERSONAL, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) frmBeleg.ShowDialog(Me) Case "L" If B.storniert Then MsgBox("Der Beleg wurde bereits storiniert!") : Exit Sub - Dim frmBeleg As New SDL.frmNacherfassungLeihgeld(PERSONAL, Nothing, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) + Dim frmBeleg As New SDL.frmNacherfassungLeihgeld(PERSONAL, Nothing, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) frmBeleg.ShowDialog(Me) Case Else - Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, PERSONAL.Mandant, PERSONAL.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) + Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, B.Mandant, B.Niederlassung, B.Benutzer, B.BelegNr, B.BelegDat) frmBeleg.ShowDialog(Me) End Select @@ -1539,4 +1543,35 @@ Public Class frmNacherfassungNEU End If End Sub + + + Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles dgvBelege.CellMouseClick + If tbcntrRg.SelectedTab Is TabPage4 Then + If e.Button = MouseButtons.Right Then + If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt + If Not dgvBelege.Rows(e.RowIndex).Selected Then + dgvBelege.ClearSelection() + dgvBelege.Rows(e.RowIndex).Selected = True + End If + ContextMenuStrip2.Show(Cursor.Position) + End If + End If + End Sub + + + Private Sub KopierenZwischenablageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenZwischenablageToolStripMenuItem.Click + + If tbcntrRg.SelectedTab Is TabPage4 Then + If dgvBelege.SelectedRows.Count >= 1 Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvBelege.SelectedRows(0).Cells("clmnAnhaengeDokId").Value) + ' MsgBox(DS.OPEN_SINGLE_ORIG(False)) + + 'Zwischenablage + Dim f() As String = {DS.OPEN_SINGLE_ORIG(False)} + Dim d As New DataObject(DataFormats.FileDrop, f) + Clipboard.SetDataObject(d, True) + + End If + End If + End Sub End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index 564b072e..60dd2b66 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -45,6 +45,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAvisiererKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlRechts = New System.Windows.Forms.Panel() + Me.Button12 = New System.Windows.Forms.Button() Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() Me.Button2 = New System.Windows.Forms.Button() Me.Button13 = New System.Windows.Forms.Button() @@ -56,6 +57,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlOpt = New System.Windows.Forms.Panel() Me.pnlBerichte = New System.Windows.Forms.Panel() + Me.Button21 = New System.Windows.Forms.Button() Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button() Me.lblKdAusFortschritt = New System.Windows.Forms.Label() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() @@ -183,6 +185,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.Button22 = New System.Windows.Forms.Button() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -518,6 +521,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'pnlRechts ' Me.pnlRechts.AutoSize = True + Me.pnlRechts.Controls.Add(Me.Button12) Me.pnlRechts.Controls.Add(Me.MyListBox1) Me.pnlRechts.Controls.Add(Me.Button2) Me.pnlRechts.Controls.Add(Me.Button13) @@ -528,6 +532,17 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlRechts.Size = New System.Drawing.Size(234, 217) Me.pnlRechts.TabIndex = 35 ' + 'Button12 + ' + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.Location = New System.Drawing.Point(4, 191) + Me.Button12.Margin = New System.Windows.Forms.Padding(0) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(225, 26) + Me.Button12.TabIndex = 42 + Me.Button12.Text = "Nur Abfertigungs Leistungen" + Me.Button12.UseVisualStyleBackColor = True + ' 'MyListBox1 ' Me.MyListBox1._value = "" @@ -538,16 +553,16 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MyListBox1.Location = New System.Drawing.Point(4, 19) Me.MyListBox1.Name = "MyListBox1" Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple - Me.MyListBox1.Size = New System.Drawing.Size(225, 134) + Me.MyListBox1.Size = New System.Drawing.Size(225, 147) Me.MyListBox1.TabIndex = 1 ' 'Button2 ' Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(4, 182) + Me.Button2.Location = New System.Drawing.Point(4, 166) Me.Button2.Margin = New System.Windows.Forms.Padding(0) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(112, 26) + Me.Button2.Size = New System.Drawing.Size(115, 26) Me.Button2.TabIndex = 41 Me.Button2.Text = "Alle" Me.Button2.UseVisualStyleBackColor = True @@ -555,10 +570,10 @@ Partial Class usrCntlSpeditionsBuchSuche 'Button13 ' Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button13.Location = New System.Drawing.Point(119, 182) + Me.Button13.Location = New System.Drawing.Point(118, 166) Me.Button13.Margin = New System.Windows.Forms.Padding(0) Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(110, 26) + Me.Button13.Size = New System.Drawing.Size(111, 26) Me.Button13.TabIndex = 40 Me.Button13.Text = "Keine" Me.Button13.UseVisualStyleBackColor = True @@ -672,6 +687,8 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'pnlBerichte ' + Me.pnlBerichte.Controls.Add(Me.Button22) + Me.pnlBerichte.Controls.Add(Me.Button21) Me.pnlBerichte.Controls.Add(Me.btnSpedBuchEinnahmen) Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt) Me.pnlBerichte.Controls.Add(Me.MenuStrip1) @@ -705,6 +722,20 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' + 'Button21 + ' + Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button21.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button21.Location = New System.Drawing.Point(155, 129) + Me.Button21.Margin = New System.Windows.Forms.Padding(0) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(154, 25) + Me.Button21.TabIndex = 91 + Me.Button21.Text = "Anzahl nach Monaten" + Me.Button21.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button21.UseVisualStyleBackColor = True + ' 'btnSpedBuchEinnahmen ' Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -735,7 +766,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1}) Me.MenuStrip1.Location = New System.Drawing.Point(601, 128) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(283, 27) + Me.MenuStrip1.Size = New System.Drawing.Size(163, 27) Me.MenuStrip1.TabIndex = 89 Me.MenuStrip1.Text = "Kundenauswertungen" ' @@ -753,13 +784,13 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" - Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(274, 24) + Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(282, 24) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)" - 'ZFThyrnauZeitraumAuswählenToolStripMenuItem ' - Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFThyrnauZeitraumAuswählenToolStripMenuItem .Image"), System.Drawing.Image) - Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem " - Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(274, 24) + 'ZFThyrnauZeitraumAuswählenToolStripMenuItem + ' + Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem" + Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(282, 24) Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)" ' 'cboHandlingssatz @@ -2517,6 +2548,19 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' + 'Button22 + ' + Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button22.Location = New System.Drawing.Point(308, 129) + Me.Button22.Margin = New System.Windows.Forms.Padding(0) + Me.Button22.Name = "Button22" + Me.Button22.Size = New System.Drawing.Size(62, 25) + Me.Button22.TabIndex = 92 + Me.Button22.Text = "Woche" + Me.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button22.UseVisualStyleBackColor = True + ' 'usrCntlSpeditionsBuchSuche ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2720,4 +2764,7 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents lblKdAusFortschritt As Label Friend WithEvents cbxEIDR As CheckBox Friend WithEvents btnSpedBuchEinnahmen As Button + Friend WithEvents Button12 As Button + Friend WithEvents Button21 As Button + Friend WithEvents Button22 As Button End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index b5ac4c85..f9e9e5e2 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -174,7 +174,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAB3VJREFUSEu9VntQ1NUe + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAB3VJREFUSEu9VntQ1NUe /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index d153d11f..6a011c1f 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -516,6 +516,7 @@ Public Class usrCntlSpeditionsBuchSuche End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then pnlBerichte.Visible = True + Button21.Visible = True Button16.Visible = True Button17.Visible = True End If @@ -2118,4 +2119,91 @@ Public Class usrCntlSpeditionsBuchSuche print.Show() End If End Sub + + Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click + Dim dt = SQL.loadDgvBySql("SELECT Abfertigungsart FROM [Abfertigungsarten] where isAbfertigung=1", "FMZOLL") + MyListBox1.ClearSelected() + If dt IsNot Nothing Then + For Each r In dt.Rows + For i = 0 To MyListBox1.Items.Count - 1 + If DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value = r("Abfertigungsart") Then + MyListBox1.SetSelected(i, True) + End If + Next + Next + End If + End Sub + + Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click + DataGridView.Columns.Clear() + Dim dt As DataTable + + If False Then + + Dim sqlstr As String = "" + sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(month,Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl FROM Speditionsbuch " + sqlstr &= " WHERE 1=1 " + dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & + " GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(month,Abfertigungsdatum) " & + " ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(month,Abfertigungsdatum) ", + "FMZOLL", , getSpedbuchList()) + Else + + Dim sqlstr As String = "" + sqlstr &= " SELECT DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum) Jahr, DATEPART(month,Speditionsbuch.Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl,SUM(Barzahlungsbetrag) as Barzahlungsbetrag,isnull(sum(SteuerfreierGesamtbetrag+SteuerpflichtigerGesamtbetrag),0) as RgBetrag " + sqlstr &= " FROM Speditionsbuch " + sqlstr &= " LEFT JOIN Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr " + sqlstr &= " INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID=RechnungsausgangPositionen.RK_ID " + sqlstr &= " INNER JOIN leistungen ON RechnungsausgangPositionen.LeistungsNr=leistungen.LeistungsNr " + sqlstr &= " WHERE 1=1 and leistungen.Abfertigungskosten=1 " + + dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & + " GROUP BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(month,Speditionsbuch.Abfertigungsdatum) " & + " ORDER BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(month,Speditionsbuch.Abfertigungsdatum) ", + "FMZOLL", , getSpedbuchList()) + End If + + + If dt IsNot Nothing Then DataGridView.DataSource = dt + End Sub + + Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click + DataGridView.Columns.Clear() + Dim dt As DataTable + + 'Dim sqlstr As String = "" + 'sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(iso_week,Abfertigungsdatum) Woche, count(*) Anzahl FROM Speditionsbuch " + 'sqlstr &= " WHERE 1=1 " + 'Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & + ' " GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) " & + ' " ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) ", + ' "FMZOLL", , getSpedbuchList()) + + If False Then + + Dim sqlstr As String = "" + sqlstr &= " SELECT DATEPART(YEAR,Abfertigungsdatum) Jahr, DATEPART(iso_week,Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl FROM Speditionsbuch " + sqlstr &= " WHERE 1=1 " + dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & + " GROUP BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) " & + " ORDER BY DATEPART(YEAR,Abfertigungsdatum), DATEPART(iso_week,Abfertigungsdatum) ", + "FMZOLL", , getSpedbuchList()) + Else + + Dim sqlstr As String = "" + sqlstr &= " SELECT DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum) Jahr, DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) Monat, sum(Abfertigungsanzahl) Anzahl,SUM(Barzahlungsbetrag) as Barzahlungsbetrag,isnull(sum(SteuerfreierGesamtbetrag+SteuerpflichtigerGesamtbetrag),0) as RgBetrag " + sqlstr &= " FROM Speditionsbuch " + sqlstr &= " LEFT JOIN Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr " + sqlstr &= " INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID=RechnungsausgangPositionen.RK_ID " + sqlstr &= " INNER JOIN leistungen ON RechnungsausgangPositionen.LeistungsNr=leistungen.LeistungsNr " + sqlstr &= " WHERE 1=1 and leistungen.Abfertigungskosten=1 " + + dt = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & + " GROUP BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) " & + " ORDER BY DATEPART(YEAR,Speditionsbuch.Abfertigungsdatum), DATEPART(iso_week,Speditionsbuch.Abfertigungsdatum) ", + "FMZOLL", , getSpedbuchList()) + End If + + If dt IsNot Nothing Then DataGridView.DataSource = dt + End Sub End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb index 73a35ba5..bf8fe456 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS.vb @@ -277,6 +277,40 @@ Public Class usrCntlATLAS_NCTS End If Next + AddHandler ADRESSEN.Button1.Click, Sub() + Dim origin = "" + Dim destination = "" + + 'Dim usrCntlVers = ADRESSEN.usrCntlVersender + 'origin &= usrCntlVers.txtStrasse.Text & " " + 'origin &= usrCntlVers.sbLand._value & " " + 'origin &= usrCntlVers.txtPlz.Text & " " + 'origin &= usrCntlVers.txtOrt.Text & " " + + If ALLG.sbAbgangZollstelle._value <> "" Then + origin = ALLG.sbAbgangZollstelle._value.Substring(0, 2) & " " & ALLG.sbAbgangZollstelle.Text + End If + + + Dim usrCntlEmpf = ADRESSEN.usrCntlEmpfaenger + destination &= usrCntlEmpf.txtStrasse.Text & " " + destination &= usrCntlEmpf.sbLand._value & " " + destination &= usrCntlEmpf.txtPlz.Text & " " + destination &= usrCntlEmpf.txtOrt.Text & " " + + + Dim duration = "" + Dim distance = "" + VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, destination, duration, "", distance) + + ADRESSEN.lblWegstreckeVonNach.Text = "von: " & origin & vbNewLine + ADRESSEN.lblWegstreckeVonNach.Text &= "nach: " & destination + + ADRESSEN.lblWegstrecke.Text = distance + ADRESSEN.lblWegZeit.Text = duration + End Sub + + SplitContainer.Panel2.Controls.Add(ALLG) lblBezugsnummer.Text = BezugsNr diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.Designer.vb index 7ef379dd..a0ace1a5 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.Designer.vb @@ -23,6 +23,12 @@ Partial Class usrCntlATLAS_ncts_Adressen _ Private Sub InitializeComponent() Me.pnl = New System.Windows.Forms.Panel() + Me.lblWegstreckeVonNach = New System.Windows.Forms.Label() + Me.lblWegZeit = New System.Windows.Forms.Label() + Me.lblWegstrecke = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() + Me.lblBefullen = New System.Windows.Forms.Label() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.grp = New System.Windows.Forms.GroupBox() Me.usrCntlSumA_Versender = New SDL.usrCntlAdresse() Me.cbxSumABeforderer = New System.Windows.Forms.CheckBox() @@ -34,8 +40,6 @@ Partial Class usrCntlATLAS_ncts_Adressen Me.usrCntlVersender = New SDL.usrCntlAdresse() Me.usrCntlHauptverpflichteter = New SDL.usrCntlAdresse() Me.PictureBox2 = New System.Windows.Forms.PictureBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.lblBefullen = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.grp.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -44,6 +48,10 @@ Partial Class usrCntlATLAS_ncts_Adressen ' 'pnl ' + Me.pnl.Controls.Add(Me.lblWegstreckeVonNach) + Me.pnl.Controls.Add(Me.lblWegZeit) + Me.pnl.Controls.Add(Me.lblWegstrecke) + Me.pnl.Controls.Add(Me.Button1) Me.pnl.Controls.Add(Me.lblBefullen) Me.pnl.Controls.Add(Me.MyComboBox1) Me.pnl.Controls.Add(Me.grp) @@ -59,6 +67,64 @@ Partial Class usrCntlATLAS_ncts_Adressen Me.pnl.Size = New System.Drawing.Size(907, 628) Me.pnl.TabIndex = 0 ' + 'lblWegstreckeVonNach + ' + Me.lblWegstreckeVonNach.Location = New System.Drawing.Point(160, 324) + Me.lblWegstreckeVonNach.Name = "lblWegstreckeVonNach" + Me.lblWegstreckeVonNach.Size = New System.Drawing.Size(265, 29) + Me.lblWegstreckeVonNach.TabIndex = 55 + ' + 'lblWegZeit + ' + Me.lblWegZeit.AutoSize = True + Me.lblWegZeit.Location = New System.Drawing.Point(20, 375) + Me.lblWegZeit.Name = "lblWegZeit" + Me.lblWegZeit.Size = New System.Drawing.Size(19, 13) + Me.lblWegZeit.TabIndex = 54 + Me.lblWegZeit.Text = "----" + Me.lblWegZeit.Visible = False + ' + 'lblWegstrecke + ' + Me.lblWegstrecke.AutoSize = True + Me.lblWegstrecke.Location = New System.Drawing.Point(20, 360) + Me.lblWegstrecke.Name = "lblWegstrecke" + Me.lblWegstrecke.Size = New System.Drawing.Size(19, 13) + Me.lblWegstrecke.TabIndex = 53 + Me.lblWegstrecke.Text = "----" + Me.lblWegstrecke.Visible = False + ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(17, 324) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(137, 29) + Me.Button1.TabIndex = 52 + Me.Button1.Text = "Strecke berechnen" + Me.Button1.UseVisualStyleBackColor = True + Me.Button1.Visible = False + ' + 'lblBefullen + ' + Me.lblBefullen.AutoSize = True + Me.lblBefullen.Location = New System.Drawing.Point(569, 8) + Me.lblBefullen.Name = "lblBefullen" + Me.lblBefullen.Size = New System.Drawing.Size(48, 13) + Me.lblBefullen.TabIndex = 51 + Me.lblBefullen.Text = "Befüllen:" + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(623, 5) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(267, 21) + Me.MyComboBox1.TabIndex = 50 + ' 'grp ' Me.grp.Controls.Add(Me.usrCntlSumA_Versender) @@ -112,7 +178,7 @@ Partial Class usrCntlATLAS_ncts_Adressen ' 'PictureBox1 ' - Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.lorry_motion + Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.lorry_motion Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.PictureBox1.Location = New System.Drawing.Point(418, 83) Me.PictureBox1.Name = "PictureBox1" @@ -173,7 +239,7 @@ Partial Class usrCntlATLAS_ncts_Adressen ' 'PictureBox2 ' - Me.PictureBox2.BackgroundImage = Global.SDL.My.Resources.lorry_motion + Me.PictureBox2.BackgroundImage = Global.SDL.My.Resources.Resources.lorry_motion Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.PictureBox2.Location = New System.Drawing.Point(421, 221) Me.PictureBox2.Name = "PictureBox2" @@ -181,33 +247,13 @@ Partial Class usrCntlATLAS_ncts_Adressen Me.PictureBox2.TabIndex = 49 Me.PictureBox2.TabStop = False ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(623, 5) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(267, 21) - Me.MyComboBox1.TabIndex = 50 - ' - 'lblBefullen - ' - Me.lblBefullen.AutoSize = True - Me.lblBefullen.Location = New System.Drawing.Point(569, 8) - Me.lblBefullen.Name = "lblBefullen" - Me.lblBefullen.Size = New System.Drawing.Size(48, 13) - Me.lblBefullen.TabIndex = 51 - Me.lblBefullen.Text = "Befüllen:" - ' - 'usrCntlATLAS_NCTS_Adressen + 'usrCntlATLAS_ncts_Adressen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.Controls.Add(Me.pnl) - Me.Name = "usrCntlATLAS_NCTS_Adressen" + Me.Name = "usrCntlATLAS_ncts_Adressen" Me.Size = New System.Drawing.Size(907, 628) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() @@ -232,5 +278,8 @@ Partial Class usrCntlATLAS_ncts_Adressen Friend WithEvents PictureBox2 As System.Windows.Forms.PictureBox Friend WithEvents lblBefullen As System.Windows.Forms.Label Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox - + Friend WithEvents lblWegZeit As Label + Friend WithEvents lblWegstrecke As Label + Friend WithEvents Button1 As Button + Friend WithEvents lblWegstreckeVonNach As Label End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb index 65e85851..42ce3458 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb @@ -395,4 +395,6 @@ End Select End Sub + + End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.Designer.vb index b87a1b58..8a213765 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.Designer.vb @@ -93,6 +93,11 @@ Partial Class usrCntlATLAS_NCTS_Allg Me.Label7 = New System.Windows.Forms.Label() Me.txtLadeort = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEntladeort = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lblWegstreckeVonNach = New System.Windows.Forms.Label() + Me.lblWegZeit = New System.Windows.Forms.Label() + Me.lblWegstrecke = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() + Me.cbxWegStrecke = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() @@ -102,6 +107,11 @@ Partial Class usrCntlATLAS_NCTS_Allg ' 'pnl ' + Me.pnl.Controls.Add(Me.cbxWegStrecke) + Me.pnl.Controls.Add(Me.lblWegstreckeVonNach) + Me.pnl.Controls.Add(Me.lblWegZeit) + Me.pnl.Controls.Add(Me.lblWegstrecke) + Me.pnl.Controls.Add(Me.Button1) Me.pnl.Controls.Add(Me.LinkLabel1) Me.pnl.Controls.Add(Me.txtKennnummer) Me.pnl.Controls.Add(Me.Label21) @@ -330,6 +340,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute5._allowFreitext = False Me.sbRoute5._AllowSetValue = False + Me.sbRoute5._allowSpaceAsSplitter = False Me.sbRoute5._autoSizeGross = False Me.sbRoute5._hideIfListEmpty = True Me.sbRoute5._value = "" @@ -354,6 +365,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute9._allowFreitext = False Me.sbRoute9._AllowSetValue = False + Me.sbRoute9._allowSpaceAsSplitter = False Me.sbRoute9._autoSizeGross = False Me.sbRoute9._hideIfListEmpty = True Me.sbRoute9._value = "" @@ -378,6 +390,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute8._allowFreitext = False Me.sbRoute8._AllowSetValue = False + Me.sbRoute8._allowSpaceAsSplitter = False Me.sbRoute8._autoSizeGross = False Me.sbRoute8._hideIfListEmpty = True Me.sbRoute8._value = "" @@ -402,6 +415,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute7._allowFreitext = False Me.sbRoute7._AllowSetValue = False + Me.sbRoute7._allowSpaceAsSplitter = False Me.sbRoute7._autoSizeGross = False Me.sbRoute7._hideIfListEmpty = True Me.sbRoute7._value = "" @@ -426,6 +440,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute6._allowFreitext = False Me.sbRoute6._AllowSetValue = False + Me.sbRoute6._allowSpaceAsSplitter = False Me.sbRoute6._autoSizeGross = False Me.sbRoute6._hideIfListEmpty = True Me.sbRoute6._value = "" @@ -450,6 +465,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute4._allowFreitext = False Me.sbRoute4._AllowSetValue = False + Me.sbRoute4._allowSpaceAsSplitter = False Me.sbRoute4._autoSizeGross = False Me.sbRoute4._hideIfListEmpty = True Me.sbRoute4._value = "" @@ -474,6 +490,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute3._allowFreitext = False Me.sbRoute3._AllowSetValue = False + Me.sbRoute3._allowSpaceAsSplitter = False Me.sbRoute3._autoSizeGross = False Me.sbRoute3._hideIfListEmpty = True Me.sbRoute3._value = "" @@ -498,6 +515,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute2._allowFreitext = False Me.sbRoute2._AllowSetValue = False + Me.sbRoute2._allowSpaceAsSplitter = False Me.sbRoute2._autoSizeGross = False Me.sbRoute2._hideIfListEmpty = True Me.sbRoute2._value = "" @@ -522,6 +540,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbRoute1._allowFreitext = False Me.sbRoute1._AllowSetValue = False + Me.sbRoute1._allowSpaceAsSplitter = False Me.sbRoute1._autoSizeGross = False Me.sbRoute1._hideIfListEmpty = True Me.sbRoute1._value = "" @@ -728,6 +747,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle5._allowFreitext = False Me.sbDurchgangszollstelle5._AllowSetValue = False + Me.sbDurchgangszollstelle5._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle5._autoSizeGross = False Me.sbDurchgangszollstelle5._hideIfListEmpty = True Me.sbDurchgangszollstelle5._value = "" @@ -752,6 +772,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle9._allowFreitext = False Me.sbDurchgangszollstelle9._AllowSetValue = False + Me.sbDurchgangszollstelle9._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle9._autoSizeGross = False Me.sbDurchgangszollstelle9._hideIfListEmpty = True Me.sbDurchgangszollstelle9._value = "" @@ -776,6 +797,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle8._allowFreitext = False Me.sbDurchgangszollstelle8._AllowSetValue = False + Me.sbDurchgangszollstelle8._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle8._autoSizeGross = False Me.sbDurchgangszollstelle8._hideIfListEmpty = True Me.sbDurchgangszollstelle8._value = "" @@ -800,6 +822,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle7._allowFreitext = False Me.sbDurchgangszollstelle7._AllowSetValue = False + Me.sbDurchgangszollstelle7._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle7._autoSizeGross = False Me.sbDurchgangszollstelle7._hideIfListEmpty = True Me.sbDurchgangszollstelle7._value = "" @@ -824,6 +847,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle6._allowFreitext = False Me.sbDurchgangszollstelle6._AllowSetValue = False + Me.sbDurchgangszollstelle6._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle6._autoSizeGross = False Me.sbDurchgangszollstelle6._hideIfListEmpty = True Me.sbDurchgangszollstelle6._value = "" @@ -848,6 +872,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle4._allowFreitext = False Me.sbDurchgangszollstelle4._AllowSetValue = False + Me.sbDurchgangszollstelle4._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle4._autoSizeGross = False Me.sbDurchgangszollstelle4._hideIfListEmpty = True Me.sbDurchgangszollstelle4._value = "" @@ -872,6 +897,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle3._allowFreitext = False Me.sbDurchgangszollstelle3._AllowSetValue = False + Me.sbDurchgangszollstelle3._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle3._autoSizeGross = False Me.sbDurchgangszollstelle3._hideIfListEmpty = True Me.sbDurchgangszollstelle3._value = "" @@ -896,6 +922,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle2._allowFreitext = False Me.sbDurchgangszollstelle2._AllowSetValue = False + Me.sbDurchgangszollstelle2._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle2._autoSizeGross = False Me.sbDurchgangszollstelle2._hideIfListEmpty = True Me.sbDurchgangszollstelle2._value = "" @@ -920,6 +947,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbDurchgangszollstelle1._allowFreitext = False Me.sbDurchgangszollstelle1._AllowSetValue = False + Me.sbDurchgangszollstelle1._allowSpaceAsSplitter = False Me.sbDurchgangszollstelle1._autoSizeGross = False Me.sbDurchgangszollstelle1._hideIfListEmpty = True Me.sbDurchgangszollstelle1._value = "" @@ -952,6 +980,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbBestimmungsland._allowFreitext = False Me.sbBestimmungsland._AllowSetValue = False + Me.sbBestimmungsland._allowSpaceAsSplitter = False Me.sbBestimmungsland._autoSizeGross = False Me.sbBestimmungsland._hideIfListEmpty = True Me.sbBestimmungsland._value = "" @@ -994,6 +1023,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbVersendungsLand._allowFreitext = False Me.sbVersendungsLand._AllowSetValue = False + Me.sbVersendungsLand._allowSpaceAsSplitter = False Me.sbVersendungsLand._autoSizeGross = False Me.sbVersendungsLand._hideIfListEmpty = True Me.sbVersendungsLand._value = "" @@ -1018,6 +1048,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbBestimmungZollstelle._allowFreitext = False Me.sbBestimmungZollstelle._AllowSetValue = False + Me.sbBestimmungZollstelle._allowSpaceAsSplitter = False Me.sbBestimmungZollstelle._autoSizeGross = False Me.sbBestimmungZollstelle._hideIfListEmpty = True Me.sbBestimmungZollstelle._value = "" @@ -1060,6 +1091,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbAbgangZollstelle._allowFreitext = False Me.sbAbgangZollstelle._AllowSetValue = False + Me.sbAbgangZollstelle._allowSpaceAsSplitter = False Me.sbAbgangZollstelle._autoSizeGross = False Me.sbAbgangZollstelle._hideIfListEmpty = True Me.sbAbgangZollstelle._value = "" @@ -1133,6 +1165,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbKennzeichenGrenzeLand._allowFreitext = False Me.sbKennzeichenGrenzeLand._AllowSetValue = False + Me.sbKennzeichenGrenzeLand._allowSpaceAsSplitter = False Me.sbKennzeichenGrenzeLand._autoSizeGross = False Me.sbKennzeichenGrenzeLand._hideIfListEmpty = True Me.sbKennzeichenGrenzeLand._value = "" @@ -1178,6 +1211,7 @@ Partial Class usrCntlATLAS_NCTS_Allg ' Me.sbKennzeichenAbgangLand._allowFreitext = False Me.sbKennzeichenAbgangLand._AllowSetValue = False + Me.sbKennzeichenAbgangLand._allowSpaceAsSplitter = False Me.sbKennzeichenAbgangLand._autoSizeGross = False Me.sbKennzeichenAbgangLand._hideIfListEmpty = True Me.sbKennzeichenAbgangLand._value = "" @@ -1321,6 +1355,54 @@ Partial Class usrCntlATLAS_NCTS_Allg Me.txtEntladeort.Size = New System.Drawing.Size(214, 20) Me.txtEntladeort.TabIndex = 35 ' + 'lblWegstreckeVonNach + ' + Me.lblWegstreckeVonNach.Location = New System.Drawing.Point(719, 47) + Me.lblWegstreckeVonNach.Name = "lblWegstreckeVonNach" + Me.lblWegstreckeVonNach.Size = New System.Drawing.Size(119, 29) + Me.lblWegstreckeVonNach.TabIndex = 62 + Me.lblWegstreckeVonNach.Visible = False + ' + 'lblWegZeit + ' + Me.lblWegZeit.AutoSize = True + Me.lblWegZeit.Location = New System.Drawing.Point(719, 213) + Me.lblWegZeit.Name = "lblWegZeit" + Me.lblWegZeit.Size = New System.Drawing.Size(10, 13) + Me.lblWegZeit.TabIndex = 61 + Me.lblWegZeit.Text = "-" + ' + 'lblWegstrecke + ' + Me.lblWegstrecke.AutoSize = True + Me.lblWegstrecke.Location = New System.Drawing.Point(719, 198) + Me.lblWegstrecke.Name = "lblWegstrecke" + Me.lblWegstrecke.Size = New System.Drawing.Size(10, 13) + Me.lblWegstrecke.TabIndex = 60 + Me.lblWegstrecke.Text = "-" + ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(722, 174) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(137, 21) + Me.Button1.TabIndex = 59 + Me.Button1.Text = "Strecke berechnen" + Me.Button1.UseVisualStyleBackColor = True + ' + 'cbxWegStrecke + ' + Me.cbxWegStrecke.AutoSize = True + Me.cbxWegStrecke.Checked = True + Me.cbxWegStrecke.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxWegStrecke.Location = New System.Drawing.Point(865, 177) + Me.cbxWegStrecke.Name = "cbxWegStrecke" + Me.cbxWegStrecke.Size = New System.Drawing.Size(50, 17) + Me.cbxWegStrecke.TabIndex = 63 + Me.cbxWegStrecke.Text = "LKW" + Me.cbxWegStrecke.UseVisualStyleBackColor = True + ' 'usrCntlATLAS_NCTS_Allg ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1410,4 +1492,9 @@ Partial Class usrCntlATLAS_NCTS_Allg Friend WithEvents txtKennnummer As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label21 As System.Windows.Forms.Label Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel + Friend WithEvents lblWegstreckeVonNach As Label + Friend WithEvents lblWegZeit As Label + Friend WithEvents lblWegstrecke As Label + Friend WithEvents Button1 As Button + Friend WithEvents cbxWegStrecke As CheckBox End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.vb index d7200e2a..8d290ddf 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Allg.vb @@ -389,5 +389,32 @@ sbKennzeichenGrenzeLand.SET_VALUE(sbKennzeichenAbgangLand._value) End Sub + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + Dim origin = "" + Dim destination = "" + If sbAbgangZollstelle._value <> "" Then + origin = sbAbgangZollstelle._value.Substring(0, 2) & " " & sbAbgangZollstelle.Text + Else Exit Sub + End If + + If sbBestimmungZollstelle._value <> "" Then + destination = sbBestimmungZollstelle._value.Substring(0, 2) & " " & sbBestimmungZollstelle.Text + Else Exit Sub + End If + + Dim duration = "" + Dim distance = "" + Dim distanceSek = "" + VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, destination, duration, distance, cbxWegStrecke.Checked) + + 'lblWegstreckeVonNach.Text = "von: " & origin & vbNewLine + 'lblWegstreckeVonNach.Text &= "nach: " & destination + + + lblWegstrecke.Text = "Wegstrecke: " & distance + lblWegZeit.Text = "Fahrzeit: " & duration + + + End Sub End Class diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 41664656..0496d169 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -24,6 +24,7 @@ Public Class cBerechtignungenFunctions For Each b In BERECHTIGUNEN If b.id = id And b.allowed Then Return True Next + Return False End Function @@ -449,21 +450,37 @@ Public Class cProgramFunctions End Function + Public Shared Sub initBONDrucker(cboPrinter As ComboBox, Optional srch As String = "") + 'Wenn ein Standard BON Drucker existiert, dann diesen + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON <> String.Empty Then + initDrucker(cboPrinter, VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON) + Else + initDrucker(cboPrinter, srch) + End If + + End Sub + + Public Shared Sub initDrucker(cboPrinter As ComboBox, Optional srch As String = "") ' alle installierten Drucker ermitteln und ' in in ein ArrayList-Objekt speichern - Dim sPrinters As New ArrayList - For Each sPrinter As String In PrinterSettings.InstalledPrinters - sPrinters.Add(sPrinter) - Next + Dim sPrinters As ArrayList + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then + sPrinters = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST + Else + sPrinters = New ArrayList + For Each sPrinter As String In System.Drawing.Printing.PrinterSettings.InstalledPrinters + sPrinters.Add(sPrinter) + Next + End If ' Array sortieren sPrinters.Sort() ' jetzt alle Drucker in sortierter Reihenfolge in einer ' ComboBox zur Auswahl anbieten - Dim oPS As New System.Drawing.Printing.PrinterSettings For i As Integer = 0 To sPrinters.Count - 1 cboPrinter.Items.Add(sPrinters(i)) Next @@ -479,8 +496,17 @@ Public Class cProgramFunctions Next End If + + 'Standard-Drucker: + Dim srchPrinter = "" + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then + srchPrinter = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD + Else + Dim oPS As New System.Drawing.Printing.PrinterSettings + srchPrinter = oPS.PrinterName + End If For Each i In cboPrinter.Items - If i.ToString = oPS.PrinterName Then + If i.ToString.ToUpper.Contains(srchPrinter.ToUpper) Then ' If i.ToString = srchPrinter Then ' Contains, weil sonst \\dc02\ stört cboPrinter.SelectedItem = i Exit Sub End If @@ -501,19 +527,26 @@ Public Class cProgramFunctions ' jetzt alle Drucker in sortierter Reihenfolge in einer ' ComboBox zur Auswahl anbieten - Dim oPS As New System.Drawing.Printing.PrinterSettings - If PrinterSettings.InstalledPrinters.Count > 0 Then + If System.Drawing.Printing.PrinterSettings.InstalledPrinters.Count > 0 Then If srch <> "" Then - For Each i In PrinterSettings.InstalledPrinters + For Each i In System.Drawing.Printing.PrinterSettings.InstalledPrinters If i.ToString.ToUpper.Contains(srch.ToUpper) Then Return i End If Next End If If elseStandard Then - For Each i In PrinterSettings.InstalledPrinters - If i.ToString = oPS.PrinterName Then + Dim srchPrinter = "" + If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD <> String.Empty Then + srchPrinter = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_STANDARD + Else + Dim oPS As New System.Drawing.Printing.PrinterSettings + srchPrinter = oPS.PrinterName + + End If + For Each i In System.Drawing.Printing.PrinterSettings.InstalledPrinters + If i.ToString.ToUpper.Contains(srchPrinter.ToUpper) Then ' If i.ToString = srchPrinter Then ' Contains, weil sonst \\dc02\ stört Return i End If Next diff --git a/SDL/frmMain.Designer.vb b/SDL/frmMain.Designer.vb index ec564a0c..de58ba37 100644 --- a/SDL/frmMain.Designer.vb +++ b/SDL/frmMain.Designer.vb @@ -34,8 +34,9 @@ Partial Class frmMain Me.LKWListeToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.SchnittstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.USTVAnträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.SchnittstellenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.mnueZoll = New System.Windows.Forms.ToolStripMenuItem() Me.ArtikelTarifierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -102,7 +103,6 @@ Partial Class frmMain Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.USTVAnträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlLeft.SuspendLayout() Me.MenuStripSDL.SuspendLayout() Me.Panel1.SuspendLayout() @@ -212,6 +212,17 @@ Partial Class frmMain Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(196, 6) ' + 'USTVAnträgeToolStripMenuItem + ' + Me.USTVAnträgeToolStripMenuItem.Name = "USTVAnträgeToolStripMenuItem" + Me.USTVAnträgeToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.USTVAnträgeToolStripMenuItem.Text = "USTV Anträge" + ' + 'ToolStripSeparator2 + ' + Me.ToolStripSeparator2.Name = "ToolStripSeparator2" + Me.ToolStripSeparator2.Size = New System.Drawing.Size(196, 6) + ' 'SchnittstellenToolStripMenuItem ' Me.SchnittstellenToolStripMenuItem.Name = "SchnittstellenToolStripMenuItem" @@ -219,11 +230,6 @@ Partial Class frmMain Me.SchnittstellenToolStripMenuItem.Text = "Schnittstellen" Me.SchnittstellenToolStripMenuItem.Visible = False ' - 'ToolStripSeparator2 - ' - Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(196, 6) - ' 'AuswertungenToolStripMenuItem2 ' Me.AuswertungenToolStripMenuItem2.Name = "AuswertungenToolStripMenuItem2" @@ -358,7 +364,6 @@ Partial Class frmMain Me.btnTest.TabIndex = 31 Me.btnTest.Text = "test" Me.btnTest.UseVisualStyleBackColor = True - Me.btnTest.Visible = False ' 'picAVISOMessenger ' @@ -923,12 +928,6 @@ Partial Class frmMain Me.Timer_REFRESH.Enabled = True Me.Timer_REFRESH.Interval = 5000 ' - 'USTVAnträgeToolStripMenuItem - ' - Me.USTVAnträgeToolStripMenuItem.Name = "USTVAnträgeToolStripMenuItem" - Me.USTVAnträgeToolStripMenuItem.Size = New System.Drawing.Size(199, 22) - Me.USTVAnträgeToolStripMenuItem.Text = "USTV Anträge" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 0940377e..6ccc789f 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -515,7 +515,21 @@ Public Class frmMain Private Sub btnTest_Click(sender As Object, e As EventArgs) Handles btnTest.Click - Form1.Show() + 'Form1.Show() + ' Dim l As New VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401462) + Dim sdl As New VERAG_PROG_ALLGEMEIN.cSDL + + Dim list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940) + For Each l In list + l.KfzKennzeichen + Next + + MsgBox(list.Count) + Dim list2 = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940) + MsgBox(list2.Count) + Dim list3 = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, list2(0).KfzKennzeichen) + MsgBox(list3.Count) + MsgBox(list3(0).KartenNr) End Sub diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index bf6566b5..062b17ce 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -256,7 +256,11 @@ Public Class frmBelegNeu If defaultPrinter <> "" Then cProgramFunctions.initDrucker(cboPrinter, defaultPrinter) Else - cProgramFunctions.initDrucker(cboPrinter, If(EA = "E", "EPSON", "")) + If EA = "E" Then + cProgramFunctions.initBONDrucker(cboPrinter, "EPSON") ' Eingangsbeleg --> BON + Else + cProgramFunctions.initDrucker(cboPrinter) ' Ausgangsbeleg --> A4 + End If End If initTabCntlPreislisten() diff --git a/SDL/kassenbuch/frmFremdbeleg.vb b/SDL/kassenbuch/frmFremdbeleg.vb index 673cb312..7f8253f4 100644 --- a/SDL/kassenbuch/frmFremdbeleg.vb +++ b/SDL/kassenbuch/frmFremdbeleg.vb @@ -54,7 +54,7 @@ Public Class frmFremdbeleg End Sub Private Sub frmFremdbeleg_Load(sender As Object, e As EventArgs) Handles Me.Load - cProgramFunctions.initDrucker(cboPrinter, "EPSON") + cProgramFunctions.initBONDrucker(cboPrinter, "EPSON") If BELEG Is Nothing Then BELEG = New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID) diff --git a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb index fdb6c091..3b2f1485 100644 --- a/SDL/kassenbuch/frmNacherfassungLeihgeld.vb +++ b/SDL/kassenbuch/frmNacherfassungLeihgeld.vb @@ -33,7 +33,7 @@ Public Class frmNacherfassungLeihgeld Private Sub frmNacherfassungLeihgeld_Load(sender As Object, e As EventArgs) Handles MyBase.Load txtDatum.Text = Now.ToShortDateString cProgramFunctions.initDrucker(cboPrinter) - cProgramFunctions.initDrucker(cboPrinterProvisionBeleg, "EPSON") + cProgramFunctions.initBONDrucker(cboPrinterProvisionBeleg, "EPSON") cboProvisionStaffelArt.fillWithSQL("SELECT [PreislistenNr],[PreislistenBez] FROM [VERAG].[dbo].[tblPreislisten] WHERE Art='E' ORDER BY Preislistenbez", False, "FMZOLL", False) 'cbxProvision.Checked = True diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 15540985..f3af46d1 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -1215,7 +1215,7 @@ Partial Class frmKundenblatt Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1156, 582) + Me.usrcntlKarten.Size = New System.Drawing.Size(186, 68) Me.usrcntlKarten.TabIndex = 0 ' 'tbLKW diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 3ca1cd44..9efa9dc9 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1273,10 +1273,11 @@ Public Class usrCntlKundenuebersicht Else where = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige.contains("A"), "", " AND Firma_ID IN(" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige & ")") End If - .DataSource = SQL.loadDgvBySql("SELECT [Kontonummer] as KdNr,[Belegdatum] as Datum,[Belegnummer] as Nummer,[Bruttobetrag] as Betrag,[Gesamtausstand] as [OP-Saldo],[Waehrung] as Währung,[KumSaldoEUR] ,[Buchungstext] as Referenz " & " FROM [Offene Posten] " & " WHERE [Kontonummer]='" & KUNDE.KundenNrZentrale & "' " & where & " ORDER BY OP_ID DESC /*, Belegdatum DESC*/", "FMZOLL") + + If .DataSource Is Nothing Then Exit Sub If .Columns.Count = 0 Then Exit Sub @@ -2377,9 +2378,13 @@ Public Class usrCntlKundenuebersicht Try If KUNDE Is Nothing Then Exit Sub If cboFirmaFMZOLL._value <> "" Then - VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen(cboFirmaFMZOLL._value, KUNDE.KundenNrZentrale) + If VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen(cboFirmaFMZOLL._value, KUNDE.KundenNrZentrale) Then + MsgBox("Die OP-Liste wurde erfolgreich aktualisiert!") + End If Else - VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen_ALL(KUNDE.KundenNrZentrale) + If VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen_ALL(KUNDE.KundenNrZentrale) Then + MsgBox("Die OP-Liste wurde erfolgreich aktualisiert!") + End If End If initDGVUmsatz() initDGVOffenePosten() diff --git a/SDL/packages.config b/SDL/packages.config index 3799bb37..3e5e7a0f 100644 --- a/SDL/packages.config +++ b/SDL/packages.config @@ -1,10 +1,16 @@  + + + + + + diff --git a/SDLUPDATER/SDLUPDATER.vbproj b/SDLUPDATER/SDLUPDATER.vbproj index be3203ae..59b18e84 100644 --- a/SDLUPDATER/SDLUPDATER.vbproj +++ b/SDLUPDATER/SDLUPDATER.vbproj @@ -162,6 +162,16 @@ false + + + {e4190547-b222-4ae3-a0be-a44eaee70335} + Parkzeit + + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + +