diff --git a/ADMIN.sln b/ADMIN.sln index 108cb47..df7fd74 100644 --- a/ADMIN.sln +++ b/ADMIN.sln @@ -117,8 +117,8 @@ Global {2007DD34-7BB4-4A31-A6B9-BCE62BF0AFDA}.Release|x64.Build.0 = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index cdf72df..395f80d 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -329,6 +329,7 @@ Public Class cZOLL_IMPORT Select Case filiale Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Case "4801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung + Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" End Select Dim abfertigungsnummer = getAbfertigungsnummer(LRN) diff --git a/DienstplanTV/App.config b/DienstplanTV/App.config index 1729194..cf553b3 100644 --- a/DienstplanTV/App.config +++ b/DienstplanTV/App.config @@ -1,6 +1,26 @@ - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/MailSender/App.config b/MailSender/App.config index 9d2c7ad..d0a84d3 100644 --- a/MailSender/App.config +++ b/MailSender/App.config @@ -1,6 +1,26 @@ - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index c6c10f1..8f50bd5 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -80,19 +80,92 @@ - - ..\..\..\dll\closedxml\ClosedXML.dll + + False + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll + + + False + ..\..\..\dll\ClosedXML.dll ..\..\..\dll\FastColoredTextBox.dll - - - - - - - + + ..\packages\Gcef.Data.DataEngine.3.0.2\lib\net40\Gcef.Data.DataEngine.dll + + + ..\packages\Gcef.Data.ExpressionInfo.3.0.2\lib\net40\Gcef.Data.ExpressionInfo.dll + + + ..\packages\Gcef.Data.VBFunctionLib.3.0.2\lib\net40\Gcef.Data.VBFunctionLib.dll + + + ..\packages\GrapeCity.ActiveReports.15.2.4\lib\net462\GrapeCity.ActiveReports.dll + + + ..\packages\GrapeCity.ActiveReports.Chart.15.2.2\lib\net462\GrapeCity.ActiveReports.Chart.dll + + + ..\packages\GrapeCity.ActiveReports.Core.DataProviders.2.0.7\lib\net462\GrapeCity.ActiveReports.Core.DataProviders.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Document.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Document.Drawing.Gc.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.Drawing.Gc.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Document.Drawing.Gdi.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.Drawing.Gdi.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Drawing.Gc.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Drawing.Gc.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Drawing.Gdi.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Drawing.Gdi.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Export.Pdf.Section.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Rdl.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Rdl.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Rendering.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Rendering.dll + + + ..\packages\GrapeCity.ActiveReports.Core.Scripting.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Scripting.dll + + + ..\packages\GrapeCity.ActiveReports.Document.15.2.4\lib\net462\GrapeCity.ActiveReports.Document.dll + + + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.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 + + + ..\packages\GrapeCity.ActiveReports.15.2.4\lib\net462\GrapeCity.ActiveReports.Win.dll + + + ..\packages\GrapeCity.DataVisualization.Chart.0.4.23\lib\net462\GrapeCity.DataVisualization.Chart.dll + + + ..\packages\GrapeCity.Documents.Common.4.2.0.722\lib\net461\GrapeCity.Documents.Common.dll + + + ..\packages\GrapeCity.Documents.Common.Windows.4.2.0.722\lib\net461\GrapeCity.Documents.Common.Windows.dll + + + ..\packages\GrapeCity.Documents.DX.Windows.4.2.0.722\lib\net461\GrapeCity.Documents.DX.Windows.dll + + + ..\packages\GrapeCity.Documents.Imaging.4.2.0.722\lib\net461\GrapeCity.Documents.Imaging.dll + ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net40-client\Hardcodet.Wpf.TaskbarNotification.dll True @@ -103,6 +176,10 @@ ..\..\..\dll\itextsharp.pdfa.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + C:\Program Files (x86)\Microsoft Visual Studio 12.0\Visual Studio Tools for Office\PIA\Office15\Microsoft.Office.Interop.Excel.dll True @@ -131,6 +208,9 @@ + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + @@ -138,8 +218,31 @@ + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -552,6 +655,7 @@ frmPrintLayout.vb + frmBenutzerBerGruppen.vb @@ -597,7 +701,6 @@ usrCntlHomepage.vb - VbMyResourcesResXFileCodeGenerator My.Resources diff --git a/UID/App.config b/UID/App.config index 2ae60e5..fb58a85 100644 --- a/UID/App.config +++ b/UID/App.config @@ -1,16 +1,16 @@ - + -
+
- - + + - + @@ -20,4 +20,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 89a012c..72695a2 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -316,6 +316,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property fähggh3j2gh6j2gh62jgh6j2hg6jghjghj() As String + Get + Return ResourceManager.GetString("fähggh3j2gh6j2gh62jgh6j2hg6jghjghj", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 57a442f..3c2554d 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -301,4 +301,7 @@ ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + \ No newline at end of file diff --git a/UID/My Project/Settings.Designer.vb b/UID/My Project/Settings.Designer.vb index 3927a0e..5cd9710 100644 --- a/UID/My Project/Settings.Designer.vb +++ b/UID/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/UID/My Project/Settings.settings b/UID/My Project/Settings.settings index 82cb5df..78690ef 100644 --- a/UID/My Project/Settings.settings +++ b/UID/My Project/Settings.settings @@ -7,7 +7,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> @@ -15,7 +15,7 @@ <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;User ID=sa;Password=BmWr501956</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> diff --git a/UID/My Project/licenses.licx b/UID/My Project/licenses.licx index 7926021..e69de29 100644 --- a/UID/My Project/licenses.licx +++ b/UID/My Project/licenses.licx @@ -1,4 +0,0 @@ -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 diff --git a/UID/packages.config b/UID/packages.config index 627183a..2989245 100644 --- a/UID/packages.config +++ b/UID/packages.config @@ -1,4 +1,34 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index a102c1e..516a91f 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -108,6 +108,7 @@ Partial Class usrctlProcedures Me.CheckBox5 = New System.Windows.Forms.CheckBox() Me.Button29 = New System.Windows.Forms.Button() Me.Button28 = New System.Windows.Forms.Button() + Me.Button30 = New System.Windows.Forms.Button() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -913,10 +914,20 @@ Partial Class usrctlProcedures Me.Button28.Text = "SYSKA OP" Me.Button28.UseVisualStyleBackColor = True ' + 'Button30 + ' + Me.Button30.Location = New System.Drawing.Point(579, 179) + Me.Button30.Name = "Button30" + Me.Button30.Size = New System.Drawing.Size(145, 49) + Me.Button30.TabIndex = 60 + Me.Button30.Text = "GOOGLE" + Me.Button30.UseVisualStyleBackColor = True + ' 'usrctlProcedures ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Button30) Me.Controls.Add(Me.Button28) Me.Controls.Add(Me.Label15) Me.Controls.Add(Me.CheckBox5) @@ -1064,4 +1075,5 @@ Partial Class usrctlProcedures Friend WithEvents CheckBox5 As CheckBox Friend WithEvents Button29 As Button Friend WithEvents Button28 As Button + Friend WithEvents Button30 As Button End Class diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 550263b..8a211ca 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -3255,6 +3255,10 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False End Sub + Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click + VERAG_PROG_ALLGEMEIN.cGoogleAPI.test() + End Sub + 'Private Sub Button26_Click(sender As Object, e As EventArgs) ' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") ' Dim fi As New FileInfo(d) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 626e6b8..ff764fa 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -275,7 +275,7 @@ Public Class frmStartOptions For Each row In dt.Rows Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp")) - If Not cDHF_Anhaenge.hasEntry Then + If Not cDHF_Anhaenge.hasEntry Then 'WENN NEU:: cDHF_Anhaenge.AnmID = row("AnmID") cDHF_Anhaenge.LizenzNr = row("LizenzNr") @@ -318,11 +318,16 @@ Public Class frmStartOptions cDHF_Anhaenge.SAVE() Select Case row("MsgTyp") - Case "EZ922" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") - Case "TR109" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS") + Case "EZ922" + DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden + sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL") + Case "TR109" + DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden + sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL") ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID) - Case "EZ923" 'Ergänzung STB - Mitteilung + Case "EZ923" 'Ergänzung STB - Mitteilung + DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL") End Select @@ -362,11 +367,11 @@ Public Class frmStartOptions If dy_SendungsId IsNot Nothing AndAlso CInt(dy_SendungsId) > 0 Then Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId) Dim list As New List(Of Integer) - sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND) - sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND) - sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND) - sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND) - sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND) + sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("EMPFAENGER")) + sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "") + sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("FRAECHTER")) + sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AVISIERER")) + sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AUFTRAGGEBER")) End If Catch ex As Exception @@ -374,6 +379,10 @@ Public Class frmStartOptions End Try End Sub + + + + 'Sub doMailZollbelegTC(pfad, art, tc_id) ' Try @@ -395,7 +404,7 @@ Public Class frmStartOptions ' End Try 'End Sub - Sub sendMailZollbeleg(pfad As String, KundenNr As Integer, art As String, ByRef list As List(Of Integer), BezugsNr As String, SND As VERAG_PROG_ALLGEMEIN.cSendungen) + Sub sendMailZollbeleg(pfad As String, KundenNr As Integer, art As String, ByRef list As List(Of Integer), BezugsNr As String, SND As VERAG_PROG_ALLGEMEIN.cSendungen, KdAtrNr As Object) Try If KundenNr > 0 Then If Not list.Exists(Function(x) x = KundenNr) Then 'nicht bereits verarbeitet @@ -440,6 +449,7 @@ Public Class frmStartOptions betreff = betreff.Replace("%LKW%", "") betreff = betreff.Replace("%Standort%", "") betreff = betreff.Replace("%Uhrzeit%", "") + betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, "")) Dim body = cStandort.eMail_Zollbeleg_Text @@ -950,7 +960,6 @@ Public Class frmStartOptions Else ' STB !!!! - betreff = sp(0).Trim