diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index ffd8b242..bb621cf1 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -3591,6 +3591,11 @@ Public Class FormularManagerNEU + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("WICHTIGER HINWEIS:", 12, 250, 70, 6, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT, 2)) + Dim cbamTxt = "Ab 01.10.2023 wurde eine Meldepflicht (CBAM) beim Import bestimmter Waren aus Drittländern eingeführt. Sie als Importeur sind für diese Meldung eigenverantwortlich. Informationen unter www.zoll.de oder www.customs-consulting.at Stichwort CBAM" + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(cbamTxt, 12, 258, 180, 30, "bold", 13, , iTextSharp.text.Element.ALIGN_LEFT, 2)) + + If usrCntl.cbxLKWWartet.Checked Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("!!! LKW wartet !!!", 141, 12, 60, 15, "boldRed", 20, , itextsharp.text.Element.ALIGN_LEFT)) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 4e485b71..e34568b2 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index af2a5e60..194ee6fb 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -127,10 +127,12 @@ Public Class usrCntlMDMAuswertungen " ,[EmpfängerOrt] as [EmpfängerAdresse 2] " & " ,[Packstücke und Warenbezeichnung] as Beschreibung,[LeistungsNr],[LeistungsBez],[Steuersatz %] ,[SteuerpflichtigerGesamtbetrag] as [SteuerpflichtigerGesamtbetrag Netto] " & " ,[SteuerfreierGesamtbetrag],[SteuerpflichtigerBetrag] as [SteuerpflichtigerBetrag Netto] ,[SteuerfreierBetrag] " & + " ,isNull([Anlage 1],'') Info " & " FROM [Rechnungsausgang] inner join [RechnungsausgangPositionen] on Rechnungsausgang.[RK_ID]=RechnungsausgangPositionen.[RK_ID] " & " inner join Adressen on Rechnungsausgang.EmpfängerKundenNr=Adressen.AdressenNr " & " WHERE RechnungsKundenNr = 150000 " & - " and RechnungsDatum between '" & datWoelflVon.Value.ToShortDateString & "' and '" & datWoelflBis.Value.ToShortDateString & "'" + " and RechnungsDatum between '" & datWoelflVon.Value.ToShortDateString & "' and '" & datWoelflBis.Value.ToShortDateString & "'" & + " order by [RechnungsNr] " ' MsgBox(sqlstr) Dim SQL As New SQL Dim dt As DataTable = SQL.loadDgvBySql(sqlstr, "FMZOLL") @@ -156,7 +158,7 @@ Public Class usrCntlMDMAuswertungen clmns = "" For j = 0 To dt.Columns.Count - 1 Dim o As Object = dt.Rows(i).Item(j).ToString - clmns &= dt.Rows(i).Item(j).ToString() & ";" + clmns &= dt.Rows(i).Item(j).ToString().Replace(vbNewLine, "").Replace(vbCr, "").Replace(vbLf, "").Replace("\n", "").Replace("\r", "").Replace(vbCrLf, "") & ";" ' If Not o Is Nothing AndAlso Not o.value Is Nothing Then 'clmns &= o.Value.ToString().Replace(";", ",") & ";" ' Else diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 9342821a..328fb45b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -169,6 +169,15 @@ Public Class SQL End Function + Public Shared Function GetEZOLL_UNISPEDConnectionString() As String + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Return My.MySettings.Default.EZOLL_UNISPEDConnectionString + Else + Return My.MySettings.Default.EZOLL_UNISPEDConnectionString + End If + End Function + + Public Shared Function GetAVISOConnectionString() As String If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Return My.MySettings.Default.AVISOConnectionStringTEST @@ -402,6 +411,26 @@ Public Class SQL End Try Return Nothing + End Function + Public Shared Function GetNewOpenConnectionEZOLL_UNISPED() As SqlConnection + Dim cn As New SqlConnection() + Try + cn.ConnectionString = GetEZOLL_UNISPEDConnectionString() + cn.Open() + Return cn + Catch + System.Threading.Thread.Sleep(500) 'warten... + '2.Versuch + Try + cn.ConnectionString = GetEZOLL_UNISPEDConnectionString() + cn.Open() + Return cn + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Try + Return Nothing + End Function Public Shared Function GetNewOpenConnectionAVISO() As SqlConnection @@ -519,6 +548,7 @@ Public Class SQL Case "ATLAS" : conn = GetNewOpenConnectionATLAS() Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG() Case "EZOLL" : conn = GetNewOpenConnectionEZOLL() + Case "EZOLL_UNISPED" : conn = GetNewOpenConnectionEZOLL_UNISPED() Case "AVISO" : conn = GetNewOpenConnectionAVISO() Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "FD" : conn = GetNewOpenConnectionFD() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cDHF_Anhaenge.vb b/VERAG_PROG_ALLGEMEIN/Classes/cDHF_Anhaenge.vb index c0e133f5..5eac81d9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cDHF_Anhaenge.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cDHF_Anhaenge.vb @@ -28,8 +28,8 @@ Public Class cDHF_Anhaenge End If End Sub - Sub New(AnmID, MsgTyp) - LOAD(AnmID, MsgTyp) + Sub New(AnmID, MsgTyp, LizenzNr) + LOAD(AnmID, MsgTyp, LizenzNr) End Sub @@ -91,12 +91,13 @@ Public Class cDHF_Anhaenge End Try End Sub - Public Sub LOAD(AnmID, MsgTyp) + Public Sub LOAD(AnmID, MsgTyp, LizenzNr) Try Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM tblDHF_Anhaenge WHERE AnmID=@AnmID AND MsgTyp=@MsgTyp ", conn) + Using cmd As New SqlCommand("SELECT * FROM tblDHF_Anhaenge WHERE AnmID=@AnmID AND MsgTyp=@MsgTyp AND LizenzNr=@LizenzNr ", conn) cmd.Parameters.AddWithValue("@AnmID", AnmID) cmd.Parameters.AddWithValue("@MsgTyp", MsgTyp) + cmd.Parameters.AddWithValue("@LizenzNr", LizenzNr) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cPDFWriteValues.vb b/VERAG_PROG_ALLGEMEIN/Classes/cPDFWriteValues.vb index 0200fcac..6c5b3012 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cPDFWriteValues.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cPDFWriteValues.vb @@ -8,10 +8,11 @@ Public Class cPDFWriteValues Private mfont As String Private mSize As Integer Private maxlength As Integer = -1 + Private page As Integer = 1 Private align As Integer = iTextSharp.text.Element.ALIGN_LEFT 'PdfContentByte.ALIGN_LEFT - Public Sub New(ByVal sText As String, ByVal X As Double, ByVal Y As Double, ByVal width As Double, ByVal height As Double, ByVal mfont As String, ByVal mSize As Integer, Optional ByVal maxlength As Integer = -1, Optional ByVal align As Integer = iTextSharp.text.Element.ALIGN_LEFT) + Public Sub New(ByVal sText As String, ByVal X As Double, ByVal Y As Double, ByVal width As Double, ByVal height As Double, ByVal mfont As String, ByVal mSize As Integer, Optional ByVal maxlength As Integer = -1, Optional ByVal align As Integer = iTextSharp.text.Element.ALIGN_LEFT, Optional ByVal page As Integer = 1) Me.sText = sText Me.X = X Me.Y = Y @@ -21,6 +22,7 @@ Public Class cPDFWriteValues Me.mSize = mSize Me.maxlength = maxlength Me.align = align + Me.page = page End Sub Public ReadOnly Property Text() As Object @@ -72,6 +74,11 @@ Public Class cPDFWriteValues Return align End Get End Property + Public ReadOnly Property getPage() As Object + Get + Return page + End Get + End Property ' Public Overrides Function ToString() As Object ' Return mText diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 5d47c1b3..86d07d1a 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -953,9 +953,9 @@ Public Class cFormularManager Dim stamper = New PdfStamper(pdf, fw) If True Then If listToWrite IsNot Nothing Then - Dim overStr As PdfContentByte = stamper.GetOverContent(1) For Each i In listToWrite - If i.Text <> "" Then write(overStr, i, pdf.GetPageSize(1).Height) + Dim overStr As PdfContentByte = stamper.GetOverContent(i.getPage) + If i.Text <> "" Then write(overStr, i, pdf.GetPageSize(i.getPage).Height) Next End If End If diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index 2d259c02..719c44c7 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -13,15 +13,15 @@ Option Explicit On Namespace My - - + + _ Partial Public NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + #Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean @@ -36,10 +36,10 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject @@ -53,342 +53,355 @@ Namespace My Return defaultInstance End Get End Property - - + + _ Public Property SCANCANON_PRODConnectionString() As String Get - Return CType(Me("SCANCANON_PRODConnectionString"), String) + Return CType(Me("SCANCANON_PRODConnectionString"),String) End Get Set - Me("SCANCANON_PRODConnectionString") = Value + Me("SCANCANON_PRODConnectionString") = value End Set End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_UIDPruefung_checkVatService"),String) End Get End Property - - + + _ Public Property DISPOConnectionString() As String Get - Return CType(Me("DISPOConnectionString"), String) + Return CType(Me("DISPOConnectionString"),String) End Get Set - Me("DISPOConnectionString") = Value + Me("DISPOConnectionString") = value End Set End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_uidAbfrageService"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_at_gv_bmf_finanzonline_session_sessionService"),String) End Get End Property - - + + _ Public Property asdadasdasdasdasdasd() As String Get - Return CType(Me("asdadasdasdasdasdasd"), String) + Return CType(Me("asdadasdasdasdasdasd"),String) End Get Set - Me("asdadasdasdasdasdasd") = Value + Me("asdadasdasdasdasdasd") = value End Set End Property - - + + _ Public ReadOnly Property FMZOLL_PRODConnectionString() As String Get - Return CType(Me("FMZOLL_PRODConnectionString"), String) + Return CType(Me("FMZOLL_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property SYSKAConnectionString() As String Get - Return CType(Me("SYSKAConnectionString"), String) + Return CType(Me("SYSKAConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ATLASConnectionString() As String Get - Return CType(Me("ATLASConnectionString"), String) + Return CType(Me("ATLASConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ADMINConnectionString_DEV() As String Get - Return CType(Me("ADMINConnectionString_DEV"), String) + Return CType(Me("ADMINConnectionString_DEV"),String) End Get End Property - - + + _ Public ReadOnly Property SDL_PRODConnectionString() As String Get - Return CType(Me("SDL_PRODConnectionString"), String) + Return CType(Me("SDL_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FMZOLLConnectionString() As String Get - Return CType(Me("FMZOLLConnectionString"), String) + Return CType(Me("FMZOLLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property AVISOConnectionStringTEST() As String Get - Return CType(Me("AVISOConnectionStringTEST"), String) + Return CType(Me("AVISOConnectionStringTEST"),String) End Get End Property - - + + _ Public ReadOnly Property AVISOConnectionString() As String Get - Return CType(Me("AVISOConnectionString"), String) + Return CType(Me("AVISOConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property SDLConnectionString() As String Get - Return CType(Me("SDLConnectionString"), String) + Return CType(Me("SDLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property EZOLLConnectionString() As String Get - Return CType(Me("EZOLLConnectionString"), String) + Return CType(Me("EZOLLConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property AVISO_ATILLAConnectionString() As String Get - Return CType(Me("AVISO_ATILLAConnectionString"), String) + Return CType(Me("AVISO_ATILLAConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property ATLAS_SBGConnectionString() As String Get - Return CType(Me("ATLAS_SBGConnectionString"), String) + Return CType(Me("ATLAS_SBGConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property UIDConnectionString() As String Get - Return CType(Me("UIDConnectionString"), String) + Return CType(Me("UIDConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property UID_PRODConnectionString() As String Get - Return CType(Me("UID_PRODConnectionString"), String) + Return CType(Me("UID_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FDConnectionString() As String Get - Return CType(Me("FDConnectionString"), String) + Return CType(Me("FDConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property FD_PRODConnectionString() As String Get - Return CType(Me("FD_PRODConnectionString"), String) + Return CType(Me("FD_PRODConnectionString"),String) End Get End Property - - + + _ Public ReadOnly Property DISPOConnectionStringTEST() As String Get - Return CType(Me("DISPOConnectionStringTEST"), String) + Return CType(Me("DISPOConnectionStringTEST"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_RKSV_DE_DSFinVKService_DSFinVKServer"),String) End Get End Property - - + + _ Public ReadOnly Property VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService() As String Get - Return CType(Me("VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService"), String) + Return CType(Me("VERAG_PROG_ALLGEMEIN_eu_europa_ec_checkVatTestService"),String) End Get End Property - - + + _ Public ReadOnly Property ADMINConnectionString() As String Get - Return CType(Me("ADMINConnectionString"), String) + Return CType(Me("ADMINConnectionString"),String) End Get End Property - - - Public ReadOnly Property AsfinagConnectionString() As String - Get - Return CType(Me("AsfinagConnectionString"), String) - End Get - End Property - - + + _ Public ReadOnly Property PARKZEITConnectionString_PROD() As String Get - Return CType(Me("PARKZEITConnectionString_PROD"), String) + Return CType(Me("PARKZEITConnectionString_PROD"),String) End Get End Property - - + + _ Public ReadOnly Property PARKZEITConnectionString_DEV() As String Get - Return CType(Me("PARKZEITConnectionString_DEV"), String) + Return CType(Me("PARKZEITConnectionString_DEV"),String) End Get End Property + + _ + Public ReadOnly Property AsfinagConnectionString() As String + Get + Return CType(Me("AsfinagConnectionString"),String) + End Get + End Property + + _ + Public Property EZOLL_UNISPEDConnectionString() As String + Get + Return CType(Me("EZOLL_UNISPEDConnectionString"),String) + End Get + Set + Me("EZOLL_UNISPEDConnectionString") = value + End Set + End Property End Class End Namespace Namespace My - - + + _ Friend Module MySettingsProperty - - + + _ Friend ReadOnly Property Settings() As Global.VERAG_PROG_ALLGEMEIN.My.MySettings Get Return Global.VERAG_PROG_ALLGEMEIN.My.MySettings.Default diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings index 89eaae1d..4edf70cb 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -173,5 +173,8 @@ </SerializableConnectionString> Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + Data Source=srv04.unisu.at;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + \ No newline at end of file