diff --git a/SDL.sln b/SDL.sln index 9e1e52fa..bc501e31 100644 --- a/SDL.sln +++ b/SDL.sln @@ -137,6 +137,7 @@ Global {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.ActiveCfg = Debug|x86 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.Build.0 = Debug|x64 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.ActiveCfg = Debug|x64 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.Build.0 = Debug|x64 {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index a1aebbfc..86dfaca6 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -965,6 +965,7 @@ Public Class cFakturierung Select Case RECHNUNG.Firma_ID Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex @@ -1572,6 +1573,11 @@ Public Class cFakturierung If displayFirmenmane Then getSignature &= "
VERAG Spedition AG
" getSignature &= "
A 4975 Suben, Nr. 100
T +43 7711 2777-0 | F +43 7711 31 073 | @ " & If(individuell, emailindividuell, "rechnungsversand@verag.ag") & " | www.verag.ag | FN 216714y
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine + Case 4 'VERAG AG (DE) + getSignature &= "" + If displayFirmenmane Then getSignature &= "
VERAG Spedition AG
" + getSignature &= "
A 4975 Suben, Nr. 100
T +43 7711 2777-0 | F +43 7711 31 073 | @ " & If(individuell, emailindividuell, "rechnungsversand@verag.ag") & " | www.verag.ag | FN 216714y
" + If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 7 'ATILLA getSignature &= "" If displayFirmenmane Then getSignature &= "
ATILLA Spedition GmbH
" @@ -2506,6 +2512,7 @@ Public Class cFakturierung Select Case ROW("Firma_ID") Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex @@ -2919,6 +2926,7 @@ Public Class cFakturierung Select Case ROW("Firma_ID") Case 1 ' rpt.picVERAG.Image= My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo_AT_imex is eh standard + Case 4 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = Nothing Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = My.Resources.aeo_CS Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index eeeb4779..1dcf0ca0 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -53,12 +53,23 @@ Public Class frmAbrechnungsMaske Select Case FirmaTmp Case "VERAG" If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "MDM" Then - cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE In ('VERAG360') ", False, "FMZOLL") + Dim whereFirma = " AND FIRMENGRUPPE In ('VERAG360')" + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') " + End If + cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.changeItem("1") MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK")) Else - cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA') ", False, "FMZOLL") + + Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA') " + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE In ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA','VERAGAG_DE') " + + End If + + cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.changeItem("1") MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) End If @@ -75,7 +86,11 @@ Public Class frmAbrechnungsMaske cboFirma.changeItem("24") MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='AMBAR' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) Case "VERAGIMEX" - cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') ", False, "FMZOLL") + Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') " + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE In ('VERAG','IMEX','VERAGUNISPED','FRONTOFFICE','ATILLA','VERAGAG_DE') " + End If + cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "VERAG" : cboFirma.changeItem("1") Case "IMEX" : cboFirma.changeItem("20") diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index dbedc2c3..f49a665c 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -516,7 +516,14 @@ Public Class usrCntlFaktAbrechnung End If Select Case FirmaTmp - Case "VERAG" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True + Case "VERAG" + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE','VERAGAG_DE') " : pnlDocs.Visible = True + MsgBox("AH") + Else + whereFirma = " AND FIRMENGRUPPE IN ('VERAG','ATILLA','FRONTOFFICE') " : pnlDocs.Visible = True + End If + Case "IMEX" : whereFirma = " AND FIRMENGRUPPE IN ('IMEX') " : pnlDocs.Visible = True 'Case "VERAG" : whereFirma = " AND Firma_ID<>20 " : pnlDocs.Visible = True 'Case "IMEX" : whereFirma = " AND Firma_ID=20 " @@ -525,7 +532,18 @@ Public Class usrCntlFaktAbrechnung Case "AMBAR" : whereFirma = " AND Firma_ID=24 " : pnlDocs.Visible = True Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 " : pnlDocs.Visible = True - Case "VERAGIMEX" : whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') " : pnlDocs.Visible = True + Case "VERAGIMEX" + whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') " + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE','VERAGAG_DE') " + End If + pnlDocs.Visible = True + Case "VERA360" + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then + whereFirma = " AND FIRMENGRUPPE IN ('VERAG360','VERAGAG_DE') " : pnlDocs.Visible = True + Else + whereFirma = " AND FIRMENGRUPPE IN ('VERAG360') " : pnlDocs.Visible = True + End If End Select cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty) @@ -1681,6 +1699,8 @@ Public Class usrCntlFaktAbrechnung Select Case cboFirma._value Case 1 : pic.BackgroundImage = My.Resources.Verag_AG_Logo pnlTop.BackColor = Color.FromArgb(0, 54, 128) + Case 4 : pic.BackgroundImage = My.Resources.Verag_AG_Logo_DE + pnlTop.BackColor = Color.FromArgb(0, 54, 128) Case 7 : pic.BackgroundImage = My.Resources.Atilla_big_med pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.Yellow Case 11 : pic.BackgroundImage = My.Resources.Verag_Customs_Service_GMBH_Logo @@ -1754,6 +1774,7 @@ Public Class usrCntlFaktAbrechnung Case "4805" : cboFirma.changeItem(11) : RECHNUNG.Firma_ID = 11 Case "4801" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7 Case "5501" : cboFirma.changeItem(20) : RECHNUNG.Firma_ID = 20 +'' Case "4819" : cboFirma.changeItem(4) : RECHNUNG.Firma_ID = 4 Case "5601" : cboFirma.changeItem("") : RECHNUNG.Firma_ID = -1 'UNISPED Case "7001" : cboFirma.changeItem("") : RECHNUNG.Firma_ID = -1 'UK oder AG diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 7e0a4261..96b2fc45 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/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index a3bfefc6..6f4c1212 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -2351,6 +2351,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Verag_AG_Logo_DE() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Verag_AG_Logo_DE", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index b851cfd2..fe0b9bab 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -886,4 +886,7 @@ ..\Resources\modaltrans_original.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-AG-Logo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SDL/Resources/Verag-AG-Logo_DE.jpg b/SDL/Resources/Verag-AG-Logo_DE.jpg new file mode 100644 index 00000000..bff133b2 Binary files /dev/null and b/SDL/Resources/Verag-AG-Logo_DE.jpg differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 32b8a51e..48d93652 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4559,6 +4559,7 @@ + Always diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb index 42ce3458..0b0d7f13 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS/usrCntlATLAS_NCTS_Adressen.vb @@ -71,7 +71,7 @@ NCTS.ncts_Empfaenger_EORI = cProgramFunctions.isLeerNothing(usrCntlEmpfaenger.txtEORI.Text) NCTS.ncts_Empfaenger_NLNR = cProgramFunctions.isLeerNothing(usrCntlEmpfaenger.txtEORINL.Text) NCTS.ncts_ZugelassenerEmpfaenger_EORI = cProgramFunctions.isLeerNothing(usrCntlZugelEmpfaenger.txtEORI.Text) - + ' MsgBox(NCTS.ncts_ZugelassenerEmpfaenger_EORI) 'SumA: Beförderer '-------------------------------- @@ -134,6 +134,7 @@ usrCntlHauptverpflichteter.txtEORINL.Text = NCTS.ncts_Hauptverpflichteter_NLNR usrCntlHauptverpflichteter.sbLand.SET_VALUE(NCTS.ncts_Hauptverpflichteter_Land) + usrCntlZugelEmpfaenger.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI 'usrCntlHauptverpflichteter.txtAnsprechpartner.Text=NCTS.ncts_Hauptverpflichteter_Ansprechpartner ' git es nicht usrCntlVersender.kdFirma.Text = NCTS.ncts_Versender_Name @@ -281,8 +282,8 @@ usrCntlEmpfaenger.txtEORINL.Text = NCTS.ncts_Empfaenger_NLNR usrCntlEmpfaenger.sbLand.SET_VALUE(NCTS.ncts_Empfaenger_Land) 'usrCntlEmpfaenger.txtAnsprechpartner.Text=NCTS.ncts_Empfaenger_Ansprechpartner ' git es nicht - - ' usrCntlHauptverpflichteter.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI + + usrCntlZugelEmpfaenger.txtEORI.Text = NCTS.ncts_ZugelassenerEmpfaenger_EORI 'usrCntlHauptverpflichteter.txtEORINL.Text = NCTS.ncts_ZugelassenerEmpfaenger_BewilligungsnummerVersender 'usrCntlHauptverpflichteter.sbLand.SET_VALUE(NCTS.ncts_Hauptverpflichteter_Land) 'usrCntlHauptverpflichteter.txtAnsprechpartner.Text=NCTS.ncts_Hauptverpflichteter_Ansprechpartner ' git es nicht diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb index f535d2ba..b1ba7728 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb @@ -37,8 +37,6 @@ Class DAKOSY_Interface_SEND 'cDY.ncts_WARENPOS=USRCNTL.POSITIONEN.getValues() '-------------------------------- - - Return cDY Catch ex As Exception @@ -873,6 +871,10 @@ Class DAKOSY_Interface_SEND If cDY.ncts_ZugelassenerEmpfaenger_IDCarnet IsNot Nothing Then XML.EinzelVersandanmeldung.KopfDaten.Adressen.Hauptverpflichteter.IDCarnet = cDY.ncts_ZugelassenerEmpfaenger_IDCarnet End If + If cDY.ncts_ZugelassenerEmpfaenger_EORI IsNot Nothing Then + XML.EinzelVersandanmeldung.KopfDaten.Adressen.Hauptverpflichteter = New VersandanmeldungNCTSDE.HauptverpflichteterVATyp + If cDY.ncts_ZugelassenerEmpfaenger_EORI IsNot Nothing Then XML.EinzelVersandanmeldung.KopfDaten.Adressen.ZugelassenderEmpfaenger.EORI = cDY.ncts_ZugelassenerEmpfaenger_EORI + End If diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index 2af74245..b3ed8279 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -71,7 +71,8 @@ End Sub - Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load + Public Shared Function getFirma_DY(FilialenNr As String, F_ME As Form) As String + Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA If (VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") And FilialenNr = 5501 Then FIRMA_DY = "IMEX" ElseIf FilialenNr = 5701 Then @@ -83,21 +84,23 @@ Else If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then - If DY Is Nothing Then - ' ' FIRMA_DY = DY. - ' Else - - Dim f As New frmDakosy_SelFirma - If f.ShowDialog(Me) = DialogResult.OK Then - FIRMA_DY = f.FIMRA_DY - Else - Me.Close() - End If + 'If DY Is Nothing Then + Dim f As New frmDakosy_SelFirma + If f.ShowDialog() = DialogResult.OK Then + FIRMA_DY = f.FIMRA_DY + Else + If F_ME IsNot Nothing Then F_ME.Close() End If + 'End If Else FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(FilialenNr) End If End If + Return FIRMA_DY + End Function + Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load + + FIRMA_DY = getFirma_DY(FilialenNr, Me) Select Case ZOLL_SYSTEM Case "SGS" diff --git a/VERAG_PROG_ALLGEMEIN/App.config b/VERAG_PROG_ALLGEMEIN/App.config index 1b4bbc07..0dede84a 100644 --- a/VERAG_PROG_ALLGEMEIN/App.config +++ b/VERAG_PROG_ALLGEMEIN/App.config @@ -44,6 +44,11 @@ + + connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" /> diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 5181438a..9342821a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -48,6 +48,20 @@ Public Class SQL End If + End Function + Public Shared Function GetPARKZEITConnectionString() As String + 'Properties.Settings.Default. + + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + Return My.MySettings.Default.PARKZEITConnectionString_DEV + + + Else + Return My.MySettings.Default.PARKZEITConnectionString_PROD + + End If + + End Function @@ -264,6 +278,18 @@ Public Class SQL End Try Return Nothing + End Function + Public Shared Function GetNewOpenConnectionPARKZEIT(Optional pooling As Boolean = True) As SqlConnection + Dim cn As New SqlConnection() + Try + cn.ConnectionString = GetPARKZEITConnectionString() & IIf(pooling, "", ";pooling=false") + 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 + Return Nothing + End Function Public Shared Function GetNewOpenConnectionWEB(Optional pooling As Boolean = True) As SqlConnection Dim cn As New SqlConnection() @@ -498,6 +524,7 @@ Public Class SQL Case "FD" : conn = GetNewOpenConnectionFD() Case "WEB" : conn = GetNewOpenConnectionWEB() Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() Case "AVISO_ATILLA" @@ -541,6 +568,7 @@ Public Class SQL Case "AVISO" : conn = GetNewOpenConnectionAVISO() Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "WEB" : conn = GetNewOpenConnectionWEB() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select ' Using conn As SqlConnection = GetNewOpenConnection() @@ -577,6 +605,7 @@ Public Class SQL Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "DISPO" : conn = GetNewOpenConnectionDISPO() Case "WEB" : conn = GetNewOpenConnectionWEB() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select Using cmd As New SqlCommand(sql, conn) @@ -646,6 +675,7 @@ Public Class SQL Case "SCANCANON" : conn = GetNewOpenConnectionSCANCANON() Case "WEB" : conn = GetNewOpenConnectionWEB() Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select End If @@ -696,6 +726,7 @@ Public Class SQL Case "AVISO" : conn = GetNewOpenConnectionAVISO() Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "WEB" : conn = GetNewOpenConnectionWEB() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select Using cmd As New SqlCommand(sql, conn) @@ -741,6 +772,7 @@ Public Class SQL Case "DISPO" : conn = GetNewOpenConnectionDISPO() Case "WEB" : conn = GetNewOpenConnectionWEB() Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() Case "AVISO_ATILLA" conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" @@ -781,6 +813,7 @@ Public Class SQL Case "DISPO" : conn = GetNewOpenConnectionDISPO() Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "WEB" : conn = GetNewOpenConnectionWEB() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select Try ' MsgBox(sql) @@ -816,6 +849,7 @@ Public Class SQL Case "DISPO" : conn = GetNewOpenConnectionDISPO() Case "VERAG" : conn = GetNewOpenConnectionFMZOLL() Case "WEB" : conn = GetNewOpenConnectionWEB() + Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT() End Select Try Using cmd As New SqlCommand(sql, conn) @@ -1249,14 +1283,14 @@ Public Class SQL " FROM veoadr WHERE basman_nr='" & basman_nr & "' And basman_nl='" & basman_nl & "' And veoant_beznr='" & veoant_beznr & "' " & " And veoant_lfdnr=" & intLfdNr & " And veopos_posnr=" & intPosNr & " And veoadr_typ=" & lngTyp & " " & " ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr, veopos_posnr, veoadr_typ ", conn) - Dim dr As SqlDataReader = cmd.ExecuteReader() - If dr.HasRows Then - dr.Read() - s = Left(Trim(dr.Item("veoadr_name1")) & Trim(", " & dr.Item("baslnd_alpha")) & Trim(", " & dr.Item("veoadr_plz")) & Trim(", " & dr.Item("veoadr_ort")), 50) - End If - dr.Close() - End Using - conn.Close() + Dim dr As SqlDataReader = cmd.ExecuteReader() + If dr.HasRows Then + dr.Read() + s = Left(Trim(dr.Item("veoadr_name1")) & Trim(", " & dr.Item("baslnd_alpha")) & Trim(", " & dr.Item("veoadr_plz")) & Trim(", " & dr.Item("veoadr_ort")), 50) + End If + dr.Close() + End Using + conn.Close() End If Return s diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cParkzeiten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cParkzeiten.vb new file mode 100644 index 00000000..7cd6d17a --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/cParkzeiten.vb @@ -0,0 +1,142 @@ + +Imports System.Data.SqlClient +Imports System.Reflection +Imports Org.BouncyCastle.Utilities + +Public Class cParkzeiten + Property ParkzeitID As Integer + Property Laufende_Nr As Object = Nothing + Property Von As DateTime + Property Bis As DateTime + Property Dauer As String + Property Dauer_Minuten As Integer + Property Kennzeichen As String + Property TarifArt As String + Property KartenNr As String + Property Bereich As String + Property KundenNr As Object = Nothing + + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New() + + End Sub + Sub New(ParkzeitID) + Me.ParkzeitID = ParkzeitID + LOAD() + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ParkzeitID", ParkzeitID,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Laufende_Nr", Laufende_Nr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Von", Von)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bis", Bis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Dauer", Dauer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Dauer_Minuten", Dauer_Minuten)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kennzeichen", Kennzeichen)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("TarifArt", TarifArt)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KartenNr", KartenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bereich", Bereich)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Parkzeiten WHERE ParkzeitID=@ParkzeitID) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "PARKZEIT", , list) + End Function + + Public Function INSERT_EXISTS() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF NOT EXISTS(SELECT * FROM Parkzeiten WHERE cast(Kennzeichen as varchar)=@Kennzeichen and Von=@Von and Bis=@Bis) " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "PARKZEIT", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionPARKZEIT() + Using cmd As New SqlCommand("SELECT * FROM Parkzeiten WHERE ParkzeitID=@ParkzeitID ", conn) + cmd.Parameters.AddWithValue("@ParkzeitID", ParkzeitID) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [Parkzeiten] SET " & str & " WHERE ParkzeitID=@ParkzeitID ") + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO Parkzeiten (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index 6d780a1d..2d259c02 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,320 +53,342 @@ 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) + Return CType(Me("AsfinagConnectionString"), String) + End Get + End Property + + + Public ReadOnly Property PARKZEITConnectionString_PROD() As String + Get + Return CType(Me("PARKZEITConnectionString_PROD"), String) + End Get + End Property + + + Public ReadOnly Property PARKZEITConnectionString_DEV() As String + Get + Return CType(Me("PARKZEITConnectionString_DEV"), String) End Get 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 022cfbc0..89eaae1d 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -152,6 +152,20 @@ </SerializableConnectionString> Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> +</SerializableConnectionString> + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956; + + + <?xml version="1.0" encoding="utf-16"?> +<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=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956;</ConnectionString> +</SerializableConnectionString> + Data Source=DEVELOPER\DEVSQL;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956; + <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 21616f6e..14289d2a 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -20,7 +20,8 @@ Public Class cATEZ_NCTS_DATA Public Property DAKOSY_Division1 As String Public Property DAKOSY_Division2 As String Public Property DAKOSY_Division3 As String - Public Property status As String = "0" + Public Property DAKOSY_Procedure As String + Public Property status As Object Property erstellung As DateTime = Now Public Property Route_Country As String Public Property Carrier_Name As String @@ -36,7 +37,6 @@ Public Class cATEZ_NCTS_DATA Public Property json As String Public Property dakosy_ref As String Public Property selectedDocuments As String - Public Property fehlerbeschreibung As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -59,6 +59,7 @@ Public Class cATEZ_NCTS_DATA list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division1", DAKOSY_Division1)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division2", DAKOSY_Division2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Division3", DAKOSY_Division3)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("DAKOSY_Procedure", DAKOSY_Procedure)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Name", Carrier_Name)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_Country", Carrier_Adress_Country)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Carrier_Adress_Postcode", Carrier_Adress_Postcode)) @@ -72,7 +73,6 @@ Public Class cATEZ_NCTS_DATA list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("json", json)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("dakosy_ref", dakosy_ref)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("selectedDocuments", selectedDocuments)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fehlerbeschreibung", fehlerbeschreibung)) Return list End Function @@ -567,7 +567,7 @@ Public Class cATEZ_NCTS_IN Dim sbRequestBody As New Chilkat.StringBuilder jsonData.EmitSb(sbRequestBody) - 'Debug.WriteLine(sbRequestBody) + Debug.WriteLine(sbRequestBody) Dim sbResponseBody As New Chilkat.StringBuilder success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) @@ -579,21 +579,11 @@ Public Class cATEZ_NCTS_IN Else If (rest.ResponseStatusCode <> 200) Then - If rest.ResponseStatusCode = 500 Then - Dim jsonResultFailure As New Chilkat.JsonObject - jsonResultFailure.LoadSb(sbResponseBody) - jsonResultFailure.Emit() - failureDesc = jsonResultFailure.StringOf("code") & "-" & jsonResultFailure.StringOf("message") - Return failureDesc - Else - - failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText - Return failureDesc - End If - + failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText + Return failureDesc Else - Dim jsonResult As New Chilkat.JsonObject + Dim jsonResult As New Chilkat.JsonObject success = jsonResult.LoadSb(sbResponseBody) jsonResult.Emit() Return jsonResult.StringOf("atezId") @@ -608,7 +598,7 @@ Public Class cATEZ_NCTS_IN End Try End Function - Shared Function setJson(ncts As cATEZ_NCTS_DATA) + Shared Function setJson(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) Dim success As Boolean @@ -619,6 +609,7 @@ Public Class cATEZ_NCTS_IN success = jsonData.UpdateString("DAKOSY.Division1", ncts.DAKOSY_Division1) success = jsonData.UpdateString("DAKOSY.Division2", ncts.DAKOSY_Division2) success = jsonData.UpdateString("DAKOSY.Division3", ncts.DAKOSY_Division3) + success = jsonData.UpdateString("DAKOSY.Procedure", ncts.DAKOSY_Procedure) success = jsonData.UpdateString("DepartureCustomsOffice", ncts.DepartureCustomsOffice) success = jsonData.UpdateString("DestinationCustomsOffice", ncts.DestinationCustomsOffice) success = jsonData.UpdateString("DatDeterminationLimit", ncts.DatDeterminationLimit) @@ -650,17 +641,7 @@ Public Class cATEZ_NCTS_IN i = i + 1 Next - ncts.json = jsonData.Emit() - - Return success - - End Function - - Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) - - Dim success As Boolean - Dim i As Integer = 0 For Each r As DataGridViewRow In dgv.Rows Dim isSelected = IIf(DBNull.Value Is r.Cells("anh_selekt").Value, False, r.Cells("anh_selekt").Value) i = 0 @@ -674,8 +655,10 @@ Public Class cATEZ_NCTS_IN success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64")) i = i + 1 End If + Next - jsonData.Emit() + ncts.json = jsonData.Emit() + Return success diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index c68f5505..ac14ba65 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -366,6 +366,7 @@ +