diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 5873bba6..aac39217 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -1584,6 +1584,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property pdf_magic() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("pdf_magic", 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 83fe8fd8..d219a636 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -151,38 +151,47 @@ ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\verag_Card1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-note11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plose_it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\mse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ambar_simple1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pay_card_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\liste-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Kostenkalkulation_CS.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\dakosy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -193,15 +202,15 @@ ..\Resources\statistik2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\IMEX-LOGO-AEO_sig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\food1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zauberstab.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mic-logo - short.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -217,9 +226,6 @@ ..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\beleg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pay_card_s1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,9 +244,15 @@ ..\Resources\warenkorb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\verag_only.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\exit.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,9 +262,6 @@ ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Kostenkalkulation.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\Atilla_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -265,11 +274,14 @@ ..\Resources\rechnung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\beleg1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\therefore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RG_ZF_NEW.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -277,6 +289,9 @@ ..\Resources\pfeil_oben.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\warenkorb1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,8 +310,11 @@ ..\Resources\person_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\auto_mailversand_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\entwurf.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -307,11 +325,14 @@ ..\Resources\email11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Ustveu-Rechnungsanlagen-DE.xls;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\flagge_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -337,6 +358,9 @@ ..\Resources\Plakette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Auswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,30 +373,27 @@ ..\Resources\Atilla_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Einheitspapier-0777_kurz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\lorry_motion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\CBAM_Auswertung_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\statistik.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\aeo_CS.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,27 +409,21 @@ ..\Resources\sgs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\therefore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\seal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Verag-Customs-Service-GMBH-Logo_sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Unisped_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\spedbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -418,12 +433,18 @@ ..\Resources\aktiveVeredelung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\VERAG_CBAM_Report_Template.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\therefore1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Abrechnung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\KVI_report.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\viatoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,11 +457,14 @@ ..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\list_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\moneybag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\print_sr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -454,8 +478,11 @@ ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\moneybag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ambar_simple1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -463,9 +490,6 @@ ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\locked.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -475,33 +499,30 @@ ..\Resources\cards1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\auto_mailversand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\spedbuch1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\picboxPrevious_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\KVI_report_general.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\flagge_D.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_big_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route4_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\VERAG_360.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - ..\Resources\Kostenkalkulation_IMEX.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\ungueltig_de.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\VERAG_AEO_MailSig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -514,17 +535,26 @@ ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Klipphausen_Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\data.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picboxZoomOut_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\unisped_aeo_ZS_AT.jpg;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 + + ..\Resources\cards.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pay_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\chimes.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -541,14 +571,14 @@ ..\Resources\Verag-Spedition-GMBH-Logo1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Auswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\picboxPrevious_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Route2_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\..\data\awor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -577,14 +607,17 @@ ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pay_card_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Customs_Clearance_Template.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -592,11 +625,11 @@ ..\Resources\woelfl.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\android-note11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Kostenkalkulation.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\email1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -607,14 +640,14 @@ ..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\aktiveVeredelung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cards.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 ..\Resources\plose_cz.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -658,8 +691,8 @@ ..\Resources\transp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\uta.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\android-friends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\LKW1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -667,6 +700,9 @@ ..\Resources\Unisped_DE_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\list_new_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -676,8 +712,8 @@ ..\Resources\plose_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route4_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pay_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\statistik1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -688,8 +724,14 @@ ..\Resources\android-add-contact1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plose_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Ustveu_Rechnungsanlagen_BE.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -709,14 +751,11 @@ ..\Resources\xml_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\unisped_aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ambar_boarder.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -754,17 +793,14 @@ ..\Resources\passpic_sw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Route3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\transfer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -772,11 +808,11 @@ ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ungueltig_de.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\FA_Graz_EV-Veranlagung_Muster.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -784,20 +820,20 @@ ..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picboxRotateLeft_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\seal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 ..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -805,20 +841,17 @@ ..\Resources\SR_EVOLOG.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\SR_TransFerry360.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\..\data\flagge_gb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SR_TransFerry360.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\android-note12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -826,8 +859,8 @@ ..\Resources\print_rg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plose_it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\road.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -835,17 +868,20 @@ ..\Resources\Unisped_ZS_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\list_new_small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Kostenkalkulation_UNI.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\modaltrans_original.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -856,11 +892,8 @@ ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\unisped_aeo_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\email_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -880,11 +913,11 @@ ..\Resources\Route2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\unisped_aeo_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\verag_only.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-Customs-Service-GMBH-Logo_sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-AG-Logo2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -895,8 +928,8 @@ ..\Resources\linked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\beleg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a VERAGZoll1 @@ -907,8 +940,8 @@ ..\Resources\linked_b.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\moneybag1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -916,9 +949,6 @@ ..\..\..\data\mahn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\kasse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\email_print1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -931,8 +961,11 @@ ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\picboxZoomOut_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plose_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\scanner1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -940,8 +973,8 @@ ..\Resources\aeo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\rechnung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -949,8 +982,8 @@ ..\Resources\Einheitspapier-0777_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -967,37 +1000,7 @@ ..\Resources\durmaz.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zauberstab.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\VERAG_CBAM_Report_Template.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\KVI_report.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\KVI_report_general.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Kostenkalkulation_UNI.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\auto_mailversand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\auto_mailversand_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Ustveu-Rechnungsanlagen-DE.xls;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Ustveu_Rechnungsanlagen_BE.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Klipphausen_Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf_magic.png;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_CBAM_Report_Template.xlsx b/SDL/Resources/VERAG_CBAM_Report_Template.xlsx index 8c1aa5db..8b6893bf 100644 Binary files a/SDL/Resources/VERAG_CBAM_Report_Template.xlsx and b/SDL/Resources/VERAG_CBAM_Report_Template.xlsx differ diff --git a/SDL/Resources/pdf_magic.png b/SDL/Resources/pdf_magic.png new file mode 100644 index 00000000..80bd9af8 Binary files /dev/null and b/SDL/Resources/pdf_magic.png differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 337ae810..dc421f95 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -1646,6 +1646,12 @@ Form + + usrCntlATLAS_SummarischeAnmeldung.vb + + + UserControl + usrCntlATLAS_AnkunftsAnzeige.vb @@ -4073,6 +4079,9 @@ frmRoutenAuswahlDetails.vb + + usrCntlATLAS_SummarischeAnmeldung.vb + usrCntlATLAS_AnkunftsAnzeige.vb @@ -5531,6 +5540,7 @@ + Always diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.Designer.vb new file mode 100644 index 00000000..24d232c1 --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.Designer.vb @@ -0,0 +1,467 @@ + +Partial Class usrCntlATLAS_SummarischeAnmeldung + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) + Me.btnAllgemein = New System.Windows.Forms.Button() + Me.pnl = New System.Windows.Forms.Panel() + Me.cboDakosyAction = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + Me.Label4 = New System.Windows.Forms.Label() + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtWO_ID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtWarenort = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtMRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.MyCheckbox1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) + Me.cboStammreferenz = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblBezugsnummer = New System.Windows.Forms.Label() + Me.cntxtBezugsnr = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.NeueBezugsnummerVergebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtDyMandant = New System.Windows.Forms.Label() + Me.txtDyNiederlassung = New System.Windows.Forms.Label() + Me.MenuStrip = New System.Windows.Forms.MenuStrip() + Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer.Panel1.SuspendLayout() + Me.SplitContainer.Panel2.SuspendLayout() + Me.SplitContainer.SuspendLayout() + Me.MyFlowLayoutPanel1.SuspendLayout() + Me.pnl.SuspendLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.cntxtBezugsnr.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.MenuStrip.SuspendLayout() + Me.SuspendLayout() + ' + 'SplitContainer + ' + Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1 + Me.SplitContainer.IsSplitterFixed = True + Me.SplitContainer.Location = New System.Drawing.Point(0, 25) + Me.SplitContainer.Margin = New System.Windows.Forms.Padding(0) + Me.SplitContainer.Name = "SplitContainer" + Me.SplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainer.Panel1 + ' + Me.SplitContainer.Panel1.Controls.Add(Me.MyFlowLayoutPanel1) + Me.SplitContainer.Panel1.Controls.Add(Me.pnl) + ' + 'SplitContainer.Panel2 + ' + Me.SplitContainer.Panel2.BackColor = System.Drawing.Color.White + Me.SplitContainer.Panel2.Controls.Add(Me.Button2) + Me.SplitContainer.Panel2.Controls.Add(Me.Label4) + Me.SplitContainer.Panel2.Controls.Add(Me.MyDatagridview1) + Me.SplitContainer.Panel2.Controls.Add(Me.txtWO_ID) + Me.SplitContainer.Panel2.Controls.Add(Me.txtWarenort) + Me.SplitContainer.Panel2.Controls.Add(Me.Label3) + Me.SplitContainer.Panel2.Controls.Add(Me.txtMRN) + Me.SplitContainer.Panel2.Controls.Add(Me.Label2) + Me.SplitContainer.Panel2.Controls.Add(Me.MyCheckbox1) + Me.SplitContainer.Panel2.Controls.Add(Me.cboStammreferenz) + Me.SplitContainer.Panel2.Controls.Add(Me.Label6) + Me.SplitContainer.Size = New System.Drawing.Size(934, 687) + Me.SplitContainer.SplitterDistance = 72 + Me.SplitContainer.SplitterWidth = 1 + Me.SplitContainer.TabIndex = 0 + ' + 'MyFlowLayoutPanel1 + ' + Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.WhiteSmoke + Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAllgemein) + Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) + Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(1) + Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(573, 72) + Me.MyFlowLayoutPanel1.TabIndex = 0 + ' + 'btnAllgemein + ' + Me.btnAllgemein.BackColor = System.Drawing.Color.SteelBlue + Me.btnAllgemein.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnAllgemein.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAllgemein.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.btnAllgemein.Image = Global.SDL.My.Resources.Resources.android_note12 + Me.btnAllgemein.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnAllgemein.Location = New System.Drawing.Point(2, 2) + Me.btnAllgemein.Margin = New System.Windows.Forms.Padding(2) + Me.btnAllgemein.Name = "btnAllgemein" + Me.btnAllgemein.Padding = New System.Windows.Forms.Padding(0, 12, 0, 3) + Me.btnAllgemein.Size = New System.Drawing.Size(75, 67) + Me.btnAllgemein.TabIndex = 0 + Me.btnAllgemein.Text = "Allgemein" + Me.btnAllgemein.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnAllgemein.UseVisualStyleBackColor = False + ' + 'pnl + ' + Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke + Me.pnl.Controls.Add(Me.cboDakosyAction) + Me.pnl.Controls.Add(Me.Button1) + Me.pnl.Dock = System.Windows.Forms.DockStyle.Right + Me.pnl.Location = New System.Drawing.Point(573, 0) + Me.pnl.Name = "pnl" + Me.pnl.Size = New System.Drawing.Size(361, 72) + Me.pnl.TabIndex = 1 + ' + 'cboDakosyAction + ' + Me.cboDakosyAction._allowedValuesFreiText = Nothing + Me.cboDakosyAction._allowFreiText = False + Me.cboDakosyAction._value = "" + Me.cboDakosyAction.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboDakosyAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDakosyAction.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboDakosyAction.FormattingEnabled = True + Me.cboDakosyAction.Location = New System.Drawing.Point(200, 48) + Me.cboDakosyAction.Name = "cboDakosyAction" + Me.cboDakosyAction.Size = New System.Drawing.Size(159, 21) + Me.cboDakosyAction.TabIndex = 1 + ' + 'Button1 + ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button1.BackColor = System.Drawing.Color.White + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.Button1.Location = New System.Drawing.Point(200, 5) + Me.Button1.Margin = New System.Windows.Forms.Padding(2) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(159, 42) + Me.Button1.TabIndex = 6 + Me.Button1.Text = "An DAKOSY senden -->" + Me.Button1.UseVisualStyleBackColor = False + ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.BackColor = System.Drawing.Color.White + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button2.Image = Global.SDL.My.Resources.Resources.pdf_magic + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(144, 116) + Me.Button2.Margin = New System.Windows.Forms.Padding(2) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(227, 42) + Me.Button2.TabIndex = 21 + Me.Button2.Text = "Positionen aus PDF erstellen" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = False + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(17, 188) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(59, 13) + Me.Label4.TabIndex = 20 + Me.Label4.Text = "Positionen:" + Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'MyDatagridview1 + ' + Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview1.Location = New System.Drawing.Point(144, 188) + Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.Size = New System.Drawing.Size(543, 385) + Me.MyDatagridview1.TabIndex = 19 + ' + 'txtWO_ID + ' + Me.txtWO_ID._DateTimeOnly = False + Me.txtWO_ID._numbersOnly = False + Me.txtWO_ID._numbersOnlyKommastellen = "" + Me.txtWO_ID._numbersOnlyTrennzeichen = True + Me.txtWO_ID._Prozent = False + Me.txtWO_ID._ShortDateNew = False + Me.txtWO_ID._ShortDateOnly = False + Me.txtWO_ID._TimeOnly = False + Me.txtWO_ID._TimeOnly_Seconds = False + Me.txtWO_ID._value = "" + Me.txtWO_ID._Waehrung = False + Me.txtWO_ID._WaehrungZeichen = True + Me.txtWO_ID.Enabled = False + Me.txtWO_ID.ForeColor = System.Drawing.Color.Black + Me.txtWO_ID.Location = New System.Drawing.Point(447, 54) + Me.txtWO_ID.MaxLineLength = -1 + Me.txtWO_ID.MaxLines_Warning = "" + Me.txtWO_ID.MaxLines_Warning_Label = Nothing + Me.txtWO_ID.Name = "txtWO_ID" + Me.txtWO_ID.Size = New System.Drawing.Size(42, 20) + Me.txtWO_ID.TabIndex = 18 + ' + 'txtWarenort + ' + Me.txtWarenort._DateTimeOnly = False + Me.txtWarenort._numbersOnly = False + Me.txtWarenort._numbersOnlyKommastellen = "" + Me.txtWarenort._numbersOnlyTrennzeichen = True + Me.txtWarenort._Prozent = False + Me.txtWarenort._ShortDateNew = False + Me.txtWarenort._ShortDateOnly = False + Me.txtWarenort._TimeOnly = False + Me.txtWarenort._TimeOnly_Seconds = False + Me.txtWarenort._value = "" + Me.txtWarenort._Waehrung = False + Me.txtWarenort._WaehrungZeichen = True + Me.txtWarenort.ForeColor = System.Drawing.Color.Black + Me.txtWarenort.Location = New System.Drawing.Point(144, 54) + Me.txtWarenort.MaxLineLength = -1 + Me.txtWarenort.MaxLines_Warning = "" + Me.txtWarenort.MaxLines_Warning_Label = Nothing + Me.txtWarenort.Name = "txtWarenort" + Me.txtWarenort.Size = New System.Drawing.Size(280, 20) + Me.txtWarenort.TabIndex = 17 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(17, 57) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(54, 13) + Me.Label3.TabIndex = 16 + Me.Label3.Text = "Warenort:" + Me.Label3.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'txtMRN + ' + Me.txtMRN._DateTimeOnly = False + Me.txtMRN._numbersOnly = False + Me.txtMRN._numbersOnlyKommastellen = "" + Me.txtMRN._numbersOnlyTrennzeichen = True + Me.txtMRN._Prozent = False + Me.txtMRN._ShortDateNew = False + Me.txtMRN._ShortDateOnly = False + Me.txtMRN._TimeOnly = False + Me.txtMRN._TimeOnly_Seconds = False + Me.txtMRN._value = "" + Me.txtMRN._Waehrung = False + Me.txtMRN._WaehrungZeichen = True + Me.txtMRN.ForeColor = System.Drawing.Color.Black + Me.txtMRN.Location = New System.Drawing.Point(144, 163) + Me.txtMRN.MaxLineLength = -1 + Me.txtMRN.MaxLines_Warning = "" + Me.txtMRN.MaxLines_Warning_Label = Nothing + Me.txtMRN.Name = "txtMRN" + Me.txtMRN.Size = New System.Drawing.Size(280, 20) + Me.txtMRN.TabIndex = 15 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(17, 166) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(121, 13) + Me.Label2.TabIndex = 14 + Me.Label2.Text = "NCTS-Vorpapier (MRN):" + Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'MyCheckbox1 + ' + Me.MyCheckbox1._value = "" + Me.MyCheckbox1.AutoSize = True + Me.MyCheckbox1.Checked_value = False + Me.MyCheckbox1.CheckedValue = False + Me.MyCheckbox1.Location = New System.Drawing.Point(462, 31) + Me.MyCheckbox1.Name = "MyCheckbox1" + Me.MyCheckbox1.Size = New System.Drawing.Size(225, 17) + Me.MyCheckbox1.TabIndex = 13 + Me.MyCheckbox1.Text = "Ereignis (wenn JA -> in DAKOSY erstellen)" + Me.MyCheckbox1.UseVisualStyleBackColor = True + ' + 'cboStammreferenz + ' + Me.cboStammreferenz._allowedValuesFreiText = Nothing + Me.cboStammreferenz._allowFreiText = False + Me.cboStammreferenz._value = "" + Me.cboStammreferenz.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cboStammreferenz.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboStammreferenz.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboStammreferenz.FormattingEnabled = True + Me.cboStammreferenz.Location = New System.Drawing.Point(144, 27) + Me.cboStammreferenz.Name = "cboStammreferenz" + Me.cboStammreferenz.Size = New System.Drawing.Size(280, 21) + Me.cboStammreferenz.TabIndex = 11 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(17, 30) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(57, 13) + Me.Label6.TabIndex = 12 + Me.Label6.Text = "Stammref.:" + Me.Label6.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'Label1 + ' + Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label1.AutoSize = True + Me.Label1.BackColor = System.Drawing.Color.White + Me.Label1.Location = New System.Drawing.Point(499, 7) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(82, 13) + Me.Label1.TabIndex = 5 + Me.Label1.Text = "Bezugsnummer:" + ' + 'lblBezugsnummer + ' + Me.lblBezugsnummer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblBezugsnummer.BackColor = System.Drawing.Color.White + Me.lblBezugsnummer.ContextMenuStrip = Me.cntxtBezugsnr + Me.lblBezugsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBezugsnummer.Location = New System.Drawing.Point(584, 1) + Me.lblBezugsnummer.Name = "lblBezugsnummer" + Me.lblBezugsnummer.Size = New System.Drawing.Size(347, 23) + Me.lblBezugsnummer.TabIndex = 6 + Me.lblBezugsnummer.Text = "4800/000000/17 AAA" + Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' + 'cntxtBezugsnr + ' + Me.cntxtBezugsnr.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueBezugsnummerVergebenToolStripMenuItem}) + Me.cntxtBezugsnr.Name = "cntxtBezugsnr" + Me.cntxtBezugsnr.Size = New System.Drawing.Size(239, 26) + Me.cntxtBezugsnr.Text = "Bezugsnr" + ' + 'NeueBezugsnummerVergebenToolStripMenuItem + ' + Me.NeueBezugsnummerVergebenToolStripMenuItem.Name = "NeueBezugsnummerVergebenToolStripMenuItem" + Me.NeueBezugsnummerVergebenToolStripMenuItem.Size = New System.Drawing.Size(238, 22) + Me.NeueBezugsnummerVergebenToolStripMenuItem.Text = "neue Bezugsnummer vergeben" + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.txtDyMandant) + Me.Panel1.Controls.Add(Me.Label1) + Me.Panel1.Controls.Add(Me.txtDyNiederlassung) + Me.Panel1.Controls.Add(Me.lblBezugsnummer) + Me.Panel1.Controls.Add(Me.MenuStrip) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(934, 25) + Me.Panel1.TabIndex = 1 + ' + 'txtDyMandant + ' + Me.txtDyMandant.BackColor = System.Drawing.Color.White + Me.txtDyMandant.Location = New System.Drawing.Point(372, 7) + Me.txtDyMandant.Name = "txtDyMandant" + Me.txtDyMandant.Size = New System.Drawing.Size(48, 13) + Me.txtDyMandant.TabIndex = 19 + Me.txtDyMandant.Text = "VERG" + Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'txtDyNiederlassung + ' + Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White + Me.txtDyNiederlassung.Location = New System.Drawing.Point(426, 7) + Me.txtDyNiederlassung.Name = "txtDyNiederlassung" + Me.txtDyNiederlassung.Size = New System.Drawing.Size(63, 13) + Me.txtDyNiederlassung.TabIndex = 18 + Me.txtDyNiederlassung.Text = "SUB" + ' + 'MenuStrip + ' + Me.MenuStrip.BackColor = System.Drawing.Color.White + Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OptionenToolStripMenuItem}) + Me.MenuStrip.Location = New System.Drawing.Point(0, 0) + Me.MenuStrip.Name = "MenuStrip" + Me.MenuStrip.Size = New System.Drawing.Size(934, 24) + Me.MenuStrip.TabIndex = 0 + ' + 'OptionenToolStripMenuItem + ' + Me.OptionenToolStripMenuItem.Name = "OptionenToolStripMenuItem" + Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20) + Me.OptionenToolStripMenuItem.Text = "Optionen" + ' + 'usrCntlATLAS_SummarischeAnmeldung + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.SplitContainer) + Me.Controls.Add(Me.Panel1) + Me.Name = "usrCntlATLAS_SummarischeAnmeldung" + Me.Size = New System.Drawing.Size(934, 712) + Me.SplitContainer.Panel1.ResumeLayout(False) + Me.SplitContainer.Panel2.ResumeLayout(False) + Me.SplitContainer.Panel2.PerformLayout() + CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer.ResumeLayout(False) + Me.MyFlowLayoutPanel1.ResumeLayout(False) + Me.pnl.ResumeLayout(False) + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() + Me.cntxtBezugsnr.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.MenuStrip.ResumeLayout(False) + Me.MenuStrip.PerformLayout() + Me.ResumeLayout(False) + + End Sub + Friend WithEvents SplitContainer As System.Windows.Forms.SplitContainer + Friend WithEvents MyFlowLayoutPanel1 As VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel + Friend WithEvents btnAllgemein As System.Windows.Forms.Button + Friend WithEvents pnl As System.Windows.Forms.Panel + Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents lblBezugsnummer As System.Windows.Forms.Label + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents MenuStrip As System.Windows.Forms.MenuStrip + Friend WithEvents OptionenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents cboDakosyAction As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cntxtBezugsnr As System.Windows.Forms.ContextMenuStrip + Friend WithEvents NeueBezugsnummerVergebenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents cboStammreferenz As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtDyMandant As System.Windows.Forms.Label + Friend WithEvents txtDyNiederlassung As System.Windows.Forms.Label + Friend WithEvents MyCheckbox1 As VERAG_PROG_ALLGEMEIN.MyCheckbox + Friend WithEvents txtMRN As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label2 As Label + Friend WithEvents txtWarenort As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label3 As Label + Friend WithEvents txtWO_ID As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button2 As Button + Friend WithEvents Label4 As Label + Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview +End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.resx b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.resx new file mode 100644 index 00000000..39313e13 --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 125, 17 + + + 17, 17 + + + 17, 17 + + \ No newline at end of file diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.vb new file mode 100644 index 00000000..f78d2624 --- /dev/null +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_SummarischeAnmeldung.vb @@ -0,0 +1,610 @@ +Imports System.Text +Imports DAKOSY_Worker +Imports Newtonsoft.Json.Linq +Imports VERAG_PROG_ALLGEMEIN + +Public Class usrCntlATLAS_SummarischeAnmeldung + Property ALLG As usrCntlATLAS_SummarischeAnmeldung + Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso + Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen + Dim sentToDakosy = False + Dim GesamtsicherheitREF As cAufschubKonten + Dim Standort As String = "" + Dim gsnr As Integer = -1 + Dim WarenwertEUR As Double = 0 + Dim TMPT1ProcessResult As T1ProcessResult = Nothing + + + Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + + + + Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cAufschubKonten, Standort As String, gsnr As Integer, WarenwertEUR As Double) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + Me.AVISO = AVISO + Me.SENDUNG = SENDUNG + Me.FIRMA_DY = FIRMA_DY + + Me.GesamtsicherheitREF = GesamtsicherheitREF + Me.Standort = Standort + Me.gsnr = gsnr + Me.WarenwertEUR = WarenwertEUR + + + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + End Sub + + + Private Sub usrCntlATLAS_Load(sender As Object, e As EventArgs) Handles Me.Load + + cboDakosyAction.Items.Clear() + cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Neuen Datensatz erstellen", DY_ObjektAktion.OBJ_CREATE)) + cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vohr. DS ändern", DY_ObjektAktion.OBJ_CHANGE)) + cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorh. DS stornieren", DY_ObjektAktion.OBJ_CANCEL)) + cboDakosyAction.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Datensatz an ZOLL senden", DY_ObjektAktion.OBJ_SEND)) + cboDakosyAction.changeItem(DY_ObjektAktion.OBJ_CREATE) + + 'Select Case FIRMA_DY + ' Case "VERAG" : txtDyMandant.Text = "VERG" + ' txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + ' ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + ' 'Case "SUB" : txtDyNiederlassung.Text = "VERG" + ' 'Case "SUW" : txtDyNiederlassung.Text = "ATIL" + ' ''Case "SBG" : txtDyNiederlassung.Text = "IMEX" + ' 'Case "NEU" : txtDyNiederlassung.Text = "IMEX" + ' 'Case "NKD" : txtDyNiederlassung.Text = "IMEX" + ' 'End Select + ' Case "ATILLA" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "SUW" + ' Case "UNISPED" : txtDyMandant.Text = "UNAT" : txtDyNiederlassung.Text = "ATSPED" + ' Case "IMEX" : txtDyMandant.Text = "VERG" : txtDyNiederlassung.Text = "SUB" 'VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG 'txtDyMandant.Text = "IMEX" : txtDyNiederlassung.Text = "IME" + ' Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO" + 'End Select + + txtDyMandant.Text = cDakosyFunftions.getIOPartner(FIRMA_DY, "AA") + txtDyNiederlassung.Text = cDakosyFunftions.getDivision(FIRMA_DY, "AA") + + + Dim BezugsNr As String = "" + + If SENDUNG IsNot Nothing Then + BezugsNr = (SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr & "_" & "SUMA" & AVISO.AvisoID & "_" & If(AVISO.Auftraggeber.Length > 8, AVISO.Auftraggeber.ToString.Substring(0, 5), AVISO.Auftraggeber)).Trim + lblBezugsnummer.Text = BezugsNr + txtMRN.Text = If(SENDUNG.tblSnd_ATB_T1, "") + End If + + cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='SUMA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True) + cboStammreferenz.changeItem("") + + + + If cboStammreferenz.Items.Count = 2 Then + cboStammreferenz.SelectedIndex = 1 + End If + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + + If cboStammreferenz._value = "" Then MsgBox("Stammreferenz auswählen!") : Exit Sub + If txtMRN._value = "" Then MsgBox("MRN auswählen!") : Exit Sub + If txtMRN._value.Length > 18 Then MsgBox("MRN zu lang!") : Exit Sub + If TMPT1ProcessResult IsNot Nothing Then MsgBox("Keine T1 Daten!") : Exit Sub + + + Me.Refresh() + Me.Cursor = Cursors.WaitCursor + If sentToDakosy OrElse vbYes = MsgBox("Soll die Ankunftsanzeige abgeschickt werden?", vbYesNoCancel) Then + ' Dim cDyAnm As New cDakosy_Zollanmeldungen(cDy_ART, BezugsNr, AVISO.AvisoID, SENDUNG.tblSnd_SendungID) + 'loadDYZollanmeldungen() + Dim dy_Id = -1 + + + Dim saveFile = "" + + Dim BezugsNrBez As String = "" + + If lblBezugsnummer.Text.Length > 23 Then + BezugsNrBez = lblBezugsnummer.Text.Substring(0, 23) 'Z. Zt. begrenzt auf 22 Stellen, weil Aufnahme in ATLAS beschränkt! + Else + BezugsNrBez = lblBezugsnummer.Text + End If + + + '------------------------------------------------------- + If generateSummarischeAnmeldung_001(AVISO, SENDUNG, BezugsNrBez, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, txtDyMandant.Text, txtDyNiederlassung.Text, cboStammreferenz._value, TMPT1ProcessResult) Then + If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNrBez, dy_Id, FIRMA_DY) Then + If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen. + MsgBox("Gesendet!") + + Else + 'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09) + MsgBox("Sendefehler!") + End If + + + + ' DY_ANM.UPDATE_DATA() + + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + + Me.FindForm.Close() + End If + End If + + Me.Cursor = Cursors.Default + End Sub + + + + + Shared Function generateSummarischeAnmeldung_001(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SND As VERAG_PROG_ALLGEMEIN.cSendungen, ByVal Bezugsnummer As String, ByVal BezugsnummerALIAS As String, ByRef saveFile As String, DY_ACTION As String, IOPartner As String, IODivision3 As String, BezugsnummerVorblendung As String, T1 As T1ProcessResult) As Boolean + Dim Interface_VERSION = "001" + Dim ObjectAktion = DY_ACTION + + Dim XML As New DAKOSY_Worker.SummarischeAnmeldung_001.SummarischeAnmeldungVVTyp + + 'Transaktion: + XML.Transaktion = New DAKOSY_Worker.SummarischeAnmeldung_001.TransaktionSumAInTyp + XML.Transaktion.IOPartner = IOPartner + XML.Transaktion.IODatumZeit = Now + XML.Transaktion.IOReferenz = SND.FilialenNr & "-" & SND.AbfertigungsNr & "_" & Now.ToString("ddMMyyHHmmSS") + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then XML.Transaktion.IODivision3 = IODivision3 + XML.Transaktion.Version = Interface_VERSION + + XML.EinzelSummarischeAnmeldung = New DAKOSY_Worker.SummarischeAnmeldung_001.EinzelSummarischeAnmledungTyp + + 'ObjektIdentifizierung: + XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung = New DAKOSY_Worker.SummarischeAnmeldung_001.ObjektIdentifizierungVVTyp + XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung.ObjektName = Bezugsnummer + If BezugsnummerALIAS IsNot Nothing Then XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung.ObjektAliasname = BezugsnummerALIAS + + Dim ObjektAktion As New List(Of String) + ObjektAktion.Add(ObjectAktion) + XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung.ObjektAktion = ObjektAktion + + If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "") <> "" Then + XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung.Bearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB + End If + + If BezugsnummerVorblendung IsNot Nothing AndAlso BezugsnummerVorblendung <> "" Then + XML.EinzelSummarischeAnmeldung.ObjektIdentifizierung.BezugsnummerVorblendung = BezugsnummerVorblendung + End If + + '============================================================ + ' T1-Daten + '============================================================ + Dim T1Data As JToken = Nothing + + If T1.AdditionalData IsNot Nothing AndAlso T1.AdditionalData.ContainsKey("response") Then + T1Data = T1.AdditionalData("response")?("data") + End If + + Dim TransitID As String = T1.TransitId + Dim DispatchCountry As String = T1.DispatchCountry + Dim DestinationCountry As String = T1.DestinationCountry + Dim DestinationCustomsAuthority As String = T1.DestinationCustomsAuthority + Dim ModeOfTransport As String = T1.ModeOfTransport + Dim TruckID As String = T1.TruckIdTransit + + 'Fallback, da aktuelle API-Daten unter response.data liegen + If T1Data IsNot Nothing Then + If String.IsNullOrWhiteSpace(TransitID) Then TransitID = getT1Value(T1Data, "transit_id") + If String.IsNullOrWhiteSpace(DispatchCountry) Then DispatchCountry = getT1Value(T1Data, "dispatch_country") + If String.IsNullOrWhiteSpace(DestinationCountry) Then DestinationCountry = getT1Value(T1Data, "destination_country") + If String.IsNullOrWhiteSpace(DestinationCustomsAuthority) Then DestinationCustomsAuthority = getT1Value(T1Data, "destination_customs_authority") + If String.IsNullOrWhiteSpace(ModeOfTransport) Then ModeOfTransport = getT1Value(T1Data, "mode_of_transport") + If String.IsNullOrWhiteSpace(TruckID) Then TruckID = getT1Value(T1Data, "truck_id_transit") + If String.IsNullOrWhiteSpace(TruckID) Then TruckID = getT1Value(T1Data, "truck_id_border") + End If + + '============================================================ + ' Kopfdaten + '============================================================ + XML.EinzelSummarischeAnmeldung.KopfDaten = New DAKOSY_Worker.SummarischeAnmeldung_001.KopfDatenSummarischeAnmeldungTyp + + 'Dienststelle aus z.B. + '"DE007701 - Suben-Autobahn (österr. Gebiet)" + If Not String.IsNullOrWhiteSpace(DestinationCustomsAuthority) Then + XML.EinzelSummarischeAnmeldung.KopfDaten.Dienststelle = DestinationCustomsAuthority.Split(" "c)(0) + End If + + 'Endgültige SumA + XML.EinzelSummarischeAnmeldung.KopfDaten.VorzeitigKz = "N" + + 'Kein Seeverkehr + XML.EinzelSummarischeAnmeldung.KopfDaten.SeeverkehrKz = "N" + + 'NCTS-Versand + XML.EinzelSummarischeAnmeldung.KopfDaten.NCTSVersandKz = "N" + + 'Gestellung + XML.EinzelSummarischeAnmeldung.KopfDaten.Gestellungsdatum = Now.Date + + '============================================================ + ' Beförderungsmittel + '============================================================ + XML.EinzelSummarischeAnmeldung.KopfDaten.Befoerderungsmittel = New DAKOSY_Worker.SummarischeAnmeldung_001.BefoerderungsmittelVVTyp + + 'T1 Mode 30 = Straße + If ModeOfTransport = "30" Then + XML.EinzelSummarischeAnmeldung.KopfDaten.Befoerderungsmittel.ArtCode = "03" + End If + + If Not String.IsNullOrWhiteSpace(TruckID) Then + XML.EinzelSummarischeAnmeldung.KopfDaten.Befoerderungsmittel.Kennzeichen = TruckID + End If + + '============================================================ + ' Vorpapier + '============================================================ + If Not String.IsNullOrWhiteSpace(TransitID) Then + XML.EinzelSummarischeAnmeldung.KopfDaten.Vorpapiernummer = TransitID + End If + + '============================================================ + ' Positionen + '============================================================ + XML.EinzelSummarischeAnmeldung.Position = New List(Of DAKOSY_Worker.SummarischeAnmeldung_001.PositionSummarischeAnmeldungTyp) + + Dim Items As JArray = Nothing + If T1Data IsNot Nothing AndAlso TypeOf T1Data("items") Is JArray Then Items = DirectCast(T1Data("items"), JArray) + + If Items IsNot Nothing Then + For Each T1Item As JObject In Items.OfType(Of JObject)() + + Dim POS As New DAKOSY_Worker.SummarischeAnmeldung_001.PositionSummarischeAnmeldungTyp + + Dim ItemIndex As Integer = getT1Int(T1Item, "item_index") + Dim TotalPackage As Integer = getT1Int(T1Item, "total_package") + Dim Description As String = getT1Value(T1Item, "item_description") + + POS.Positionsnummer = ItemIndex + + If Not String.IsNullOrWhiteSpace(DispatchCountry) Then POS.Versendungsland = DispatchCountry + + If Not String.IsNullOrWhiteSpace(Description) Then + If Description.Length > 280 Then Description = Description.Substring(0, 280) + POS.Warenbeschreibung = Description + End If + + If TotalPackage > 0 Then POS.Stueckzahl = TotalPackage + + XML.EinzelSummarischeAnmeldung.Position.Add(POS) + Next + End If + + '============================================================ + ' Datei speichern + '============================================================ + Dim saveDir = Application.StartupPath & "\Dakosy_SEND\" + + If Not System.IO.Directory.Exists(saveDir) Then + System.IO.Directory.CreateDirectory(saveDir) + End If + + saveFile = saveDir & "DY_VV_" & Now.ToString("yyMMdd_HHmmss") & ".xml" + + XML.SaveToFile(saveFile) + + DAKOSY_Worker.cDakosyFunftions.replaceNullDateXML(saveFile) + + Return True + End Function + + Private Shared Function getT1Value(Data As JToken, Name As String) As String + If Data Is Nothing OrElse Data(Name) Is Nothing OrElse Data(Name).Type = JTokenType.Null Then Return "" + Return Data(Name).ToString.Trim + End Function + + Private Shared Function getT1Int(Data As JToken, Name As String) As Integer + Dim Value As Integer = 0 + If Data IsNot Nothing AndAlso Data(Name) IsNot Nothing AndAlso Data(Name).Type <> JTokenType.Null Then Integer.TryParse(Data(Name).ToString, Value) + Return Value + End Function + + Private Shared Function getTelefon() As String + Dim defaultDW = "200" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "ATILLA" : Return "0043 7711 28450" + Case "AMBAR" : Return "0049 8651 9962492" + Case "UNISPED" : defaultDW = "800" + Case "IMEX" : defaultDW = "602" + Case "VERAG" : defaultDW = "200" + End Select + + Dim dw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl + Return "0049 8503 7973999 " & + If(String.IsNullOrEmpty(dw) OrElse dw.Length >= 5, defaultDW, dw) + End Function + Private Shared Function getDefaultMail_FIRMA() As String + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + Case "KLIPP" : Return "klipphausen@verag.ag" + Case "DTB" : Return "dettelbach@verag.ag" + Case "NKN" : Return "neunkirchen@verag.ag" + Case "SBG" : Return "de@verag.ag" + Case "NEU" : Return "neuhaus@verag.ag" + Case Else : Return "quickstop@verag.ag" + End Select + Case "IMEX" : Return "steuerbescheide@imex-group.at" + Case "UNISPED" : Return "office@unisped.at" + Case "AMBAR" : Return "office@ambarlog.com" + End Select + Return "quickstop@verag.ag" + End Function + Private Function createGesamtsicherheitDummy(GesSichRef As cAufschubKonten, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double) + + Try + + Dim SQL As New SQL + + + Dim OPEN_DUMMY As New cSicherheiten() + Dim attachPosNrToExistingATB = False + Dim firmaId As Integer = -1 + Dim LKW_ID As String = "" + + 'Select Case Standort + ' Case "Verag GmbH" + ' firmaId = 2 + ' Case "Verag AG" + ' firmaId = 1 + ' Case "Unisped GmbH" + ' firmaId = 21 + ' Case "AMBAR GmbH" + ' firmaId = 24 + ' Case "Verag CS" + ' firmaId = 11 + ' Case "IMEX" + ' firmaId = 20 + 'End Select + + Select Case Standort + Case Sicherheiten_Standort.VERAG_GMBH : firmaId = 2 + Case Sicherheiten_Standort.AMBAR : firmaId = 24 + Case Sicherheiten_Standort.ATILLA : firmaId = 7 + Case Sicherheiten_Standort.VERAG_AG : firmaId = 1 + Case Sicherheiten_Standort.IMEX : firmaId = 20 + Case Sicherheiten_Standort.VERAG_CS : firmaId = 11 + Case Sicherheiten_Standort.UNISPED : firmaId = 21 + Case Sicherheiten_Standort.ZOLLERN : firmaId = 90 + Case Else + End Select + + With OPEN_DUMMY + .gs_ATBNr = txtMRN._value + 'mit 0 angeben, da ansonten durch DAKOSY überschrieben + .gs_MRNNr = "" + .gs_posSubNr = Nothing + .gs_datum = Today() + .gs_warenwert = WarenwertEUR + .gs_sicherheitsbetrag = Math.Round(WarenwertEUR * (GesSichRef.brgakto_gs_zollsatz / 100), 2) + .gs_standort = Me.Standort + .gs_art = "OPEN" + .gs_datum = DateTime.Now + .gs_erstellungsdatum = DateTime.Now + .gs_freitext = "DAKOSY-DUMMY" + .gs_saldo = GesSichRef.brgakto_gs_aktSaldo + .gs_atr = "0" + .gs_zollsatz = GesSichRef.brgakto_gs_zollsatz + .gs_avisoId = AVISO.AvisoID + .gs_filialenNr = SENDUNG.FilialenNr + .gs_abfertigungsnr = SENDUNG.AbfertigungsNr + .gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + .gs_warenort = Warenort + .gs_LKWKZ = AVISO.LKW_Nr + .gs_dakoyimport = True + If gsnr > 0 Then + .gs_gsNr = gsnr + .gs_posNr = getLatestPosNr(gsnr, txtMRN._value) + attachPosNrToExistingATB = True + Else + .gs_gsNr = SQL.getValueTxtBySql("Select MAX([gs_gsNr]) + 1 As MaxGesSich from tblGesamtsicherheit", "AVISO") + .gs_posNr = 0 + End If + + End With + + Dim indexGsId = OPEN_DUMMY.SAVEOBJECT() + + Dim CLOSED_DUMMY As cGesamtsicherheitsPositionen + + If attachPosNrToExistingATB Then + CLOSED_DUMMY = New cGesamtsicherheitsPositionen(indexGsId, OPEN_DUMMY.gs_posNr) + Else + CLOSED_DUMMY = New cGesamtsicherheitsPositionen(indexGsId, 1) + End If + + With CLOSED_DUMMY + + .gsp_gsNr = OPEN_DUMMY.gs_gsNr + .gsp_warenwert = 0 ' = 0 wichtig + .gsp_sicherheitsbetrag = 0 ' = 0 wichtig + .gsp_filialenNr = OPEN_DUMMY.gs_filialenNr + .gsp_art = "CLOSE" + .gsp_abfertigungsNr = OPEN_DUMMY.gs_abfertigungsnr + .gsp_erstellungsdatum = DateTime.Now + .gsp_datum = DateTime.Now + .gsp_ust = "" + .gsp_freitext = OPEN_DUMMY.gs_freitext + .gsp_avisoId = OPEN_DUMMY.gs_avisoId + .gsp_gsNr = OPEN_DUMMY.gs_gsNr + .gsp_gspPosId = OPEN_DUMMY.gs_posNr + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + End With + + CLOSED_DUMMY.SAVE() + + GesSichRef.CalcSaldo_new() + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + End Function + + + Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer + Dim posNr As Integer = 0 + Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'" + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then + + posNr = dt.Rows(0).Item(0) + + End If + + Return posNr + + End Function + + + Private Sub MyCheckbox1_CheckedChanged(sender As Object, e As EventArgs) Handles MyCheckbox1.CheckedChanged + Button1.Enabled = Not MyCheckbox1.Checked + End Sub + + Private Sub cboStammreferenz_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboStammreferenz.SelectedIndexChanged + + Dim valueREF As String = cboStammreferenz._value + + If valueREF <> "" Then + Dim DAKOSY_REF As New cDakosy_Stammreferenzen(valueREF) + If DAKOSY_REF IsNot Nothing AndAlso DAKOSY_REF.dySr_WarenortID IsNot Nothing AndAlso IsNumeric(DAKOSY_REF.dySr_WarenortID) Then + txtWO_ID.Text = DAKOSY_REF.dySr_WarenortID.ToString + If DAKOSY_REF.dySr_WarenortID > 0 Then + txtWarenort.Text = (New SQL).getValueTxtBySql("SELECT [wo_warenort] from [tblWarenorte] where [wo_id] = " & DAKOSY_REF.dySr_WarenortID, "AVISO") + End If + End If + Else + txtWarenort.Text = "" + txtWO_ID.Text = "" + End If + + + + + + End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + loadT1DataFromPDF() + End Sub + + + Function loadT1DataFromPDF() As Boolean + Try + Dim f As New frmImportFromAVISOAnhaenge(AVISO, SENDUNG) + f.ShowDialog(Me) + If f.DialogResult <> DialogResult.OK Then Return False + If f.LIST_FILES Is Nothing OrElse f.LIST_FILES.Count = 0 Then Return False + + + Dim pdfPath = f.LIST_FILES(0) + + TMPT1ProcessResult = Nothing + + + Cursor.Current = Cursors.WaitCursor + + Dim cATEZ_Read_T1 As New cATEZ_Read_T1 + Dim result As T1ProcessResult = cATEZ_Read_T1.ProcessPdf(pdfPath) + + If result Is Nothing Then + MessageBox.Show("Keine Daten von der API erhalten.", "Declaranthub", MessageBoxButtons.OK, MessageBoxIcon.Warning) + Return False + End If + + TMPT1ProcessResult = result + + + 'txtMRN.Text = result.mrn '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + MyDatagridview1.DataSource = Nothing + MyDatagridview1.Rows.Clear() + MyDatagridview1.Columns.Clear() + + MyDatagridview1.AllowUserToAddRows = False + MyDatagridview1.AllowUserToDeleteRows = False + MyDatagridview1.ReadOnly = True + MyDatagridview1.SelectionMode = DataGridViewSelectionMode.FullRowSelect + MyDatagridview1.MultiSelect = False + + MyDatagridview1.Columns.Add("Position", "Pos.") + MyDatagridview1.Columns.Add("ExportId", "Export-ID") + MyDatagridview1.Columns.Add("InvoiceNo", "Rechnung") + MyDatagridview1.Columns.Add("Sender", "Versender") + MyDatagridview1.Columns.Add("Packages", "Packstücke") + MyDatagridview1.Columns.Add("Weight", "Gewicht") + + If result.Items IsNot Nothing Then + For Each item As T1ProcessItem In result.Items + MyDatagridview1.Rows.Add( + item.ItemIndex, + item.ExportId, + item.InvoiceNo, + item.Sender, + item.TotalPackage, + item.TotalWeight + ) + Next + End If + + MyDatagridview1.Columns("Position").Width = 55 + MyDatagridview1.Columns("ExportId").Width = 130 + MyDatagridview1.Columns("InvoiceNo").Width = 130 + MyDatagridview1.Columns("Sender").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + MyDatagridview1.Columns("Packages").Width = 90 + MyDatagridview1.Columns("Weight").Width = 100 + + MyDatagridview1.Columns("Packages").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + MyDatagridview1.Columns("Weight").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + MyDatagridview1.Columns("Weight").DefaultCellStyle.Format = "N2" + + Catch apiEx As T1ApiException + Dim sbErr As New StringBuilder() + + sbErr.AppendLine("DECLARANTHUB API FEHLER") + sbErr.AppendLine() + + If CInt(apiEx.StatusCode) > 0 Then + sbErr.AppendLine("HTTP-Status: " & CInt(apiEx.StatusCode).ToString()) + Else + sbErr.AppendLine("HTTP-Status: keine HTTP-Antwort") + End If + + If Not String.IsNullOrWhiteSpace(apiEx.ErrorKey) Then + sbErr.AppendLine("Error Key: " & apiEx.ErrorKey) + End If + + sbErr.AppendLine() + sbErr.AppendLine("Nachricht:") + sbErr.AppendLine(apiEx.Message) + + If Not String.IsNullOrWhiteSpace(apiEx.RawResponse) Then + sbErr.AppendLine() + sbErr.AppendLine("=== RAW RESPONSE ===") + sbErr.AppendLine(apiEx.RawResponse) + End If + + MessageBox.Show(sbErr.ToString(), "Declaranthub API Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error) + Return True + Catch ex As Exception + MessageBox.Show(ex.ToString(), "Allgemeiner Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error) + Return False + + Finally + Cursor.Current = Cursors.Default + End Try + Return False + End Function +End Class + diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index 1b4260e8..aed14ecd 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -257,6 +257,12 @@ Public Class frmZollanmeldung Me.pnl.Controls.Add(usrcntl) Me.Text = "AnkunftsAnzeige - Verwahrung" + Case "SUMA" 'AnkunftsAnzeige + Dim usrcntl As New usrCntlATLAS_SummarischeAnmeldung(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitREF, Standort, gsnr, WarenwertEUR) + usrcntl.Dock = DockStyle.Fill + Me.pnl.Controls.Add(usrcntl) + Me.Text = "SummarischeAnmeldung - (vorz.)Gestellung" + Case "EXG" 'Ausfuhr Gestellung Dim usrcntl As New usrCntlATLAS_EXGestellung(AVISO, SENDUNG, FIRMA_DY) usrcntl.Dock = DockStyle.Fill diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index 4a8ed601..b7e70f10 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -2478,59 +2478,59 @@ Public Class usrCntlCBAM ' ========================================================= Dim dt As New DataTable - dt.Columns.Add("MRN") - dt.Columns.Add("position_no") - dt.Columns.Add("declaration_date") - dt.Columns.Add("reference_no") - dt.Columns.Add("customer_reference") - dt.Columns.Add("representation_type") - dt.Columns.Add("tariff_code") - dt.Columns.Add("net_mass_kg") - dt.Columns.Add("gross_mass_kg") - dt.Columns.Add("origin_country") - dt.Columns.Add("dispatch_country") + dt.Columns.Add("MRN") + dt.Columns.Add("position_no") + dt.Columns.Add("declaration_date") + dt.Columns.Add("reference_no") + dt.Columns.Add("customer_reference") + dt.Columns.Add("representation_type") + dt.Columns.Add("tariff_code") + dt.Columns.Add("net_mass_kg", GetType(Decimal)) + dt.Columns.Add("gross_mass_kg", GetType(Decimal)) + dt.Columns.Add("origin_country") + dt.Columns.Add("dispatch_country") dt.Columns.Add("destination_country") dt.Columns.Add("goods_description") dt.Columns.Add("invoice_number") dt.Columns.Add("invoice_date") - dt.Columns.Add("invoice_amount") - dt.Columns.Add("invoice_currency") - dt.Columns.Add("sender_eori") - dt.Columns.Add("sender_name") - dt.Columns.Add("sender_address") - dt.Columns.Add("sender_country") - dt.Columns.Add("recipient_eori") - dt.Columns.Add("recipient_name") - dt.Columns.Add("recipient_address") - dt.Columns.Add("recipient_country") - dt.Columns.Add("importer_eori") - dt.Columns.Add("importer_name") - dt.Columns.Add("importer_address") - dt.Columns.Add("importer_country") - dt.Columns.Add("importer_email") - dt.Columns.Add("importer_phone") - dt.Columns.Add("declarant_eori") - dt.Columns.Add("declarant_name") - dt.Columns.Add("declarant_address") - dt.Columns.Add("declarant_country") - dt.Columns.Add("requested_procedure") - dt.Columns.Add("previous_procedure") - dt.Columns.Add("measurement_unit") - dt.Columns.Add("member_state_authorisation") - dt.Columns.Add("discharge_bill_waiver") - dt.Columns.Add("authorisation") - dt.Columns.Add("inward_processing_start") - dt.Columns.Add("inward_processing_end") - dt.Columns.Add("inward_processing_deadline") - dt.Columns.Add("Benchmark (Default)") - dt.Columns.Add("Emission (Default)") - dt.Columns.Add("Factor") - dt.Columns.Add("Estimated Cost") + dt.Columns.Add("invoice_amount", GetType(Decimal)) + dt.Columns.Add("invoice_currency") + dt.Columns.Add("sender_eori") + dt.Columns.Add("sender_name") + dt.Columns.Add("sender_address") + dt.Columns.Add("sender_country") + dt.Columns.Add("recipient_eori") + dt.Columns.Add("recipient_name") + dt.Columns.Add("recipient_address") + dt.Columns.Add("recipient_country") + dt.Columns.Add("importer_eori") + dt.Columns.Add("importer_name") + dt.Columns.Add("importer_address") + dt.Columns.Add("importer_country") + dt.Columns.Add("importer_email") + dt.Columns.Add("importer_phone") + dt.Columns.Add("declarant_eori") + dt.Columns.Add("declarant_name") + dt.Columns.Add("declarant_address") + dt.Columns.Add("declarant_country") + dt.Columns.Add("requested_procedure") + dt.Columns.Add("previous_procedure") + dt.Columns.Add("measurement_unit") + dt.Columns.Add("member_state_authorisation") + dt.Columns.Add("discharge_bill_waiver") + dt.Columns.Add("authorisation") + dt.Columns.Add("inward_processing_start") + dt.Columns.Add("inward_processing_end") + dt.Columns.Add("inward_processing_deadline") + dt.Columns.Add("Benchmark (Default)", GetType(Decimal)) + dt.Columns.Add("Emission (Default)", GetType(Decimal)) + dt.Columns.Add("Factor", GetType(Decimal)) + dt.Columns.Add("Estimated Cost", GetType(Decimal)) - ' ========================================================= - ' Befüllen - ' ========================================================= - For Each r In details + ' ========================================================= + ' Befüllen + ' ========================================================= + For Each r In details Dim KdAtrNr As String = "" diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb index ae423b52..ce364658 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHub.vb @@ -36,6 +36,7 @@ Public Class cRelayHub Public Property contactPersonPhoneNumber As String Public Property contactPersonPosition As String Public Property contactPersonEmail As String ' <--- NEU + End Class Public Class cRelayHubCost @@ -45,11 +46,12 @@ Public Class cRelayHub Public Class cRelayHubHeaderData Public Property agentContact As cRelayHubAgentContact - Public Property declarantIsConsignee As Boolean - Public Property representationRelationshipCode As String ' <- war String - Public Property inputTaxDeduction As Boolean ' <- war String + + ' DAKOSY + Public Property declarantIsConsignee As Boolean? + Public Property representationRelationshipCode As String + Public Property inputTaxDeduction As Boolean? Public Property procedureCodeRequested As String - ' Entfernt: goodsStatus, costs (nicht im Schema an dieser Stelle) Public Property transportMeansArrivalIdentity As String Public Property transportMeansNationalityCode As String Public Property previousAdministrativeReferenceType As String @@ -59,6 +61,13 @@ Public Class cRelayHub Public Property departureCountry As String Public Property addressedCustomsOffice As String Public Property dv1CostAllocation As cRelayHubDv1CostAllocation + + ' MODALTRANS + Public Property serviceCode As String + Public Property docType As String + Public Property declarationType As String + Public Property declarantEori As String + Public Property additionalProcedureCode As String End Class Public Class cRelayHubAddress @@ -70,6 +79,7 @@ Public Class cRelayHub Public Property countryCode As String Public Property postalCode As String Public Property city As String + Public Property district As String End Class Public Class cRelayHubDeclaration @@ -80,15 +90,42 @@ Public Class cRelayHub Public Class cRelayHubAdditionalData Public Property transaction As cRelayHubTransaction + Public Property micImportShipment As cRelayHubMicImportShipment Public Property declaration As List(Of cRelayHubDeclaration) End Class + Public Class cRelayHubMicImportShipment + Public Property company As String + Public Property plant As String + Public Property connectionId As String + Public Property partnerId As String + Public Property partyId As String + Public Property messageId As String + Public Property transactionId As String + Public Property dateTime As String + Public Property sequenceNum As Integer? + Public Property actionCode As String + Public Property shipmentId As String + Public Property shipmentPartial As String + Public Property shipmentVersion As Integer? + Public Property documentNumber As Integer? + Public Property shipmentType As String + Public Property customsDate As String + + End Class Public Class cRelayHubAdditionalSettings Public Property combineOptions As List(Of String) Public Property combineItemsPriorityDocumentType As String + Public Property disableOutbound As Boolean? + Public Property disableDocumentConverter As Boolean? + Public Property disableAiToCommon As Boolean? + Public Property disableValidation As Boolean? + Public Property targetLang As String End Class Public Class cRelayHubJobOrderRequest + + Public Property environment As cRelayHubEnvironment = cRelayHubEnvironment.PROD Public Property referenceNo As String Public Property dispatchCountry As String Public Property destinationCountry As String @@ -100,13 +137,27 @@ Public Class cRelayHub ' Neu: Pflichtfeld lt. Fehlermeldung Public Property outputApplication As String ' "test" | "dakosy/sftp/vera" | "evrim/excel" | "sec/import/integration" + ' "modaltrans/customs/declaration" End Class + Public Class cRelayHubOutputApplication + Public Const Dakosy As String = "dakosy/sftp/verg" + Public Const Modaltrans As String = "modaltrans/customs/declaration" + Public Const MIC_NL_IMPORT As String = "MIC_NL_IMPORT" + End Class + Public Enum cRelayHubEnvironment + TEST + PROD + End Enum + + Public Class cRelayHubJobOrderResponse Public Property id As String Public Property status As String Public Property createdAt As String Public Property referenceNo As String + Public Property jobOrderProcessingId As String + Public Property jobOrderNo As String End Class Public Class cRelayHubApiResult @@ -117,42 +168,61 @@ Public Class cRelayHub Public Property Data As cRelayHubJobOrderResponse ' Nur bei 201 End Class + Private Shared ReadOnly ENVIRONMENT As cRelayHubEnvironment = cRelayHubEnvironment.PROD + Shared API_URL As String = "https://declaranthub.singlewindow.io/api/v1-0" + + Private Shared Function GetApiUrl(environment As cRelayHubEnvironment) As String + Select Case environment + Case cRelayHubEnvironment.TEST + Return "https://test-relayhub.singlewindow.io/api/v1-0" + Case cRelayHubEnvironment.PROD + Return "https://declaranthub.singlewindow.io/api/v1-0" + Case Else + Throw New ApplicationException("Unbekannte RelayHub-Umgebung.") + End Select + End Function + + Public Class cRelayHub_sendToRelayHub_JobOrderRequest Shared API_URL As String = "https://declaranthub.singlewindow.io/api/v1-0" ' Low-level Sender: holt Access-Token aus cRelayHubToken und sendet JSON - Private Shared Function SendJobOrder(jsonPayload As String) As Chilkat.HttpResponse + Private Shared Function SendJobOrder(jsonPayload As String, environment As cRelayHubEnvironment) As Chilkat.HttpResponse Dim http As New Chilkat.Http http.SetRequestHeader("Accept", "application/json") - - ' *** Token aus der separaten Token-Klasse beziehen *** - Dim token As String = cRelayHubToken.GetAccessToken() + Dim token As String = cRelayHubToken.GetAccessToken(environment) http.AuthToken = token - 'http.AuthToken = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJqdkkzQ3BfbTVTb3JpdUFmSEZkZzJWUGgxcDFNWHA3ZnpjNFhyVHpGWVc4In0.eyJleHAiOjE3NjEzMDE4NTQsImlhdCI6MTc2MTIxNTQ1NCwianRpIjoiNWY3MjdkZTUtMmQ2MS00MThkLWJhYWQtNmY5ODM0NDk2NjY2IiwiaXNzIjoiaHR0cHM6Ly9sb2dpbi5zaW5nbGV3aW5kb3cuaW8vYXV0aC9yZWFsbXMvYWdzdyIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiI5OWMwOTFmMy01Mjg1LTRhNzUtODdjNC0zODJlNThlNTBmNGMiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJhZ3N3LWFkbWluIiwic2lkIjoiMzRjMDY4ZGMtNjY3My00NDk5LTgzODAtMjVkOGYyNjI1NGY4IiwiYWxsb3dlZC1vcmlnaW5zIjpbImh0dHBzOi8vc2luZ2xld2luZG93LmlvIiwiaHR0cHM6Ly9hZ3N3LnNpbmdsZXdpbmRvdy5pbyIsImh0dHA6Ly9sb2NhbGhvc3Q6MzAwMSJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1hZ3N3Iiwib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoicHJvZHVjdC1jYXRhbG9nLXNjcCBwcm9maWxlIGVtYWlsIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsIm5hbWUiOiJEaHViLVByb2QgVXNlciIsInByZWZlcnJlZF91c2VybmFtZSI6ImRodWJAdmVyYWcuYWciLCJnaXZlbl9uYW1lIjoiRGh1Yi1Qcm9kIiwiZmFtaWx5X25hbWUiOiJVc2VyIiwiZW1haWwiOiJkaHViQHZlcmFnLmFnIn0.TZ8GkXrL7SSz1CEOnLB2eAAuVcYu3wlNtnAF6Y3wt0lnMGyse5tsI0YYSfGZG_Ae8zVcPqHqVT4rhDOgIPooBkq71z35ppd6b-FUaS6hSy4cMWQaidsHZr3hkID8amVQcB2vz9Yg985h3MOCSIn86d0x9i0euew3wEpF8eEHSfk_Wqf8jeJbiXAPHfy92K4Xh8IIuh-GXUTyN-NmGM94_NhcQwb4e7YMXjPPuslUsjABEfOvT7v4-AnO5B3ZczX0h0UgafmfiIyXSaL4IzYZojoMJ0CRsHdAK-j4gzXqz4lW0A9KMmHGHn01Oftt9mXfrEmCj0XGWF9xvBuYhxMUAQ" - Console.WriteLine("Using Token =: " & http.AuthToken) - Console.WriteLine("API_URL =: " & API_URL) - Return http.PostJson2(API_URL & "/job-orders/init", "application/json", jsonPayload) + Dim apiUrl As String = GetApiUrl(environment) + Console.WriteLine("API_URL =: " & apiUrl) + Return http.PostJson2(apiUrl & "/job-orders/init", "application/json", jsonPayload) End Function ' Public API: erstellt Job-Order mit 401-Retry Public Shared Function getJSON(request As cRelayHubJobOrderRequest) As String - Dim result As New cRelayHubApiResult() Try Dim sanitized = Sanitize(request) - Dim settings As New JsonSerializerSettings With { - .NullValueHandling = NullValueHandling.Ignore, - .ContractResolver = New Newtonsoft.Json.Serialization.DefaultContractResolver With { - .NamingStrategy = New Newtonsoft.Json.Serialization.CamelCaseNamingStrategy() - } - } - Dim jsonPayload As String = JsonConvert.SerializeObject(sanitized, settings) - Console.WriteLine("JSON → " & jsonPayload) - Return JsonConvert.SerializeObject(request) + Dim settings As New JsonSerializerSettings With { + .NullValueHandling = NullValueHandling.Ignore, + .ContractResolver = New Newtonsoft.Json.Serialization.DefaultContractResolver With { + .NamingStrategy = New Newtonsoft.Json.Serialization.CamelCaseNamingStrategy() + } + } + + Dim jsonPayload As String = + JsonConvert.SerializeObject(sanitized, settings) + + Console.WriteLine("JSON → " & jsonPayload) + + Return jsonPayload Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR( + ex.Message, + ex.StackTrace, + System.Reflection.MethodInfo.GetCurrentMethod.Name) + Return "Error" End Try End Function @@ -178,7 +248,7 @@ Public Class cRelayHub ' 1. Versuch - Dim response As Chilkat.HttpResponse = SendJobOrder(jsonPayload) + Dim response As Chilkat.HttpResponse = SendJobOrder(jsonPayload, request.environment) If response Is Nothing Then Return New cRelayHubApiResult With { .Success = False, .StatusCode = 0, .Message = "Verbindungsfehler", @@ -273,11 +343,11 @@ Public Class cRelayHub Case "Rechnung", "Konsi-Rechnung", "INVOICE" : fileType = "commercial_invoice" Case "CMR" : fileType = "cmr" Case "Ausfuhr", "EXPORT" : fileType = "tr_export_declaration" - Case "ATR", "A.TR", "ATR-EUR1", "EUR1" : fileType = "atr" + Case "ATR", "A.TR", "ATR-EUR1" : fileType = "atr" Case "Vorpapier", "T1" : fileType = "transit_declaration" Case "Ursprungszeugnis", "CoO" : fileType = "origin" Case "Lieferschein" : fileType = "delivery_note" - Case "Packliste" : fileType = "packaging_list" + Case "Packliste" : fileType = "packing_list" Case "Freihandelszone", "FTZ" : fileType = "ftz" Case "EUR1", "EUR", "EUR.1" : fileType = "eur" Case "GGED_D", "GGED-D" : fileType = "gged_p" @@ -287,7 +357,47 @@ Public Class cRelayHub End If Return fileType End Function - Private Shared Function Sanitize(req As cRelayHub.cRelayHubJobOrderRequest) As cRelayHub.cRelayHubJobOrderRequest + Private Shared Function IsModaltrans(req As cRelayHubJobOrderRequest) As Boolean + Return String.Equals(req.outputApplication, "modaltrans/customs/declaration", StringComparison.OrdinalIgnoreCase) + End Function + Private Shared Function IsMIC_NL_IMPORT(req As cRelayHubJobOrderRequest) As Boolean + Return String.Equals(req.outputApplication, cRelayHubOutputApplication.MIC_NL_IMPORT, StringComparison.OrdinalIgnoreCase) + End Function + + + Private Shared Sub SetMIC_NL_IMPORT(req As cRelayHubJobOrderRequest) + If req.environment = cRelayHubEnvironment.PROD Then Throw New ApplicationException("MIC NL Import ist derzeit nur im RelayHub-Testsystem verfügbar.") + + req.outputApplication = "mic/import" + req.regimeType = "IM" + + If req.additionalData Is Nothing Then req.additionalData = New cRelayHubAdditionalData + If req.additionalData.micImportShipment Is Nothing Then req.additionalData.micImportShipment = New cRelayHubMicImportShipment + + Dim mic = req.additionalData.micImportShipment + mic.company = "NL" + mic.plant = "IN" + mic.connectionId = "MICWebService" + mic.actionCode = "DIF" + + If String.IsNullOrWhiteSpace(mic.partnerId) Then mic.partnerId = req.referenceNo + If String.IsNullOrWhiteSpace(mic.shipmentId) Then mic.shipmentId = req.referenceNo + If String.IsNullOrWhiteSpace(mic.messageId) Then mic.messageId = req.referenceNo + If String.IsNullOrWhiteSpace(mic.transactionId) Then mic.transactionId = req.referenceNo + If String.IsNullOrWhiteSpace(mic.dateTime) Then mic.dateTime = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ") + If String.IsNullOrWhiteSpace(mic.shipmentType) Then mic.shipmentType = "E" + + If req.additionalSettings Is Nothing Then req.additionalSettings = New cRelayHubAdditionalSettings + req.additionalSettings.disableOutbound = False + End Sub + + Private Shared Function Sanitize(req As cRelayHubJobOrderRequest) As cRelayHubJobOrderRequest + If req Is Nothing Then Throw New ApplicationException("RelayHub Request fehlt.") + + Dim isMicNlImport As Boolean = IsMIC_NL_IMPORT(req) + + If isMicNlImport Then SetMIC_NL_IMPORT(req) + req.outputApplication = If(req.outputApplication, "").Trim() req.dispatchCountry = If(req.dispatchCountry, "").Trim().ToUpperInvariant() req.destinationCountry = If(req.destinationCountry, "").Trim().ToUpperInvariant() @@ -295,31 +405,41 @@ Public Class cRelayHub If req.dispatchCountry.Length <> 2 Then Throw New ApplicationException("dispatchCountry ISO-2 erforderlich.") If req.destinationCountry.Length <> 2 Then Throw New ApplicationException("destinationCountry ISO-2 erforderlich.") - ' AdditionalSettings -> combineOptions: nur erlaubte Keys, distinct, lower-case - Dim allowed As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) From { - "description", "commodity_code", "country_of_origin", "unit_type" - } + If isMicNlImport Then + If req.additionalData Is Nothing OrElse req.additionalData.micImportShipment Is Nothing Then Throw New ApplicationException("micImportShipment für MIC NL Import erforderlich.") - If req.additionalSettings IsNot Nothing Then + Dim mic = req.additionalData.micImportShipment + mic.partnerId = If(mic.partnerId, "").Trim() + mic.partyId = If(mic.partyId, "").Trim() + mic.shipmentId = If(mic.shipmentId, "").Trim() - If req.additionalSettings.combineOptions IsNot Nothing Then - Dim cleaned = req.additionalSettings.combineOptions. - Where(Function(o) Not String.IsNullOrWhiteSpace(o)). - Select(Function(o) o.Trim().ToLowerInvariant()). - Where(Function(o) allowed.Contains(o)). - Distinct(). - ToList() + If mic.partnerId = "" Then Throw New ApplicationException("MIC partnerId erforderlich.") + If mic.partyId = "" Then Throw New ApplicationException("MIC partyId erforderlich.") + If mic.shipmentId = "" Then Throw New ApplicationException("MIC shipmentId erforderlich.") - req.additionalSettings.combineOptions = cleaned + ElseIf IsModaltrans(req) Then + If req.additionalData IsNot Nothing Then + req.additionalData.transaction = Nothing + If req.additionalData.declaration IsNot Nothing Then + For Each declaration In req.additionalData.declaration + declaration.objectIdentification = Nothing + Next + End If End If + If req.additionalSettings IsNot Nothing AndAlso req.additionalSettings.combineOptions Is Nothing Then req.additionalSettings.combineOptions = New List(Of String) + Else + Dim allowed As New HashSet(Of String)(StringComparer.OrdinalIgnoreCase) From { + "description", + "commodity_code", + "country_of_origin", + "unit_type" + } - req.additionalSettings.combineItemsPriorityDocumentType = - If(req.additionalSettings.combineItemsPriorityDocumentType, "").Trim() - - If req.additionalSettings.combineItemsPriorityDocumentType = "" Then - req.additionalSettings.combineItemsPriorityDocumentType = Nothing + If req.additionalSettings IsNot Nothing Then + If req.additionalSettings.combineOptions IsNot Nothing Then req.additionalSettings.combineOptions = req.additionalSettings.combineOptions.Where(Function(o) Not String.IsNullOrWhiteSpace(o)).Select(Function(o) o.Trim().ToLowerInvariant()).Where(Function(o) allowed.Contains(o)).Distinct().ToList() + req.additionalSettings.combineItemsPriorityDocumentType = If(req.additionalSettings.combineItemsPriorityDocumentType, "").Trim() + If req.additionalSettings.combineItemsPriorityDocumentType = "" Then req.additionalSettings.combineItemsPriorityDocumentType = Nothing End If - End If Return req diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHubToken.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHubToken.vb index b6ceb505..1889ce41 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHubToken.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/RELAYHUB/cRelayHubToken.vb @@ -2,208 +2,254 @@ Imports System.IO Imports System.Net.Http Imports System.Text -Imports System.Web +Imports System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel Imports Newtonsoft.Json - -' NuGet: Newtonsoft.Json (>= 13.x) +Imports sun.security.util +Imports VERAG_PROG_ALLGEMEIN.cRelayHub Public Class cRelayHubToken - ' ======= KONFIG ======= - Private Shared ReadOnly TOKEN_ENDPOINT As String = "https://login.singlewindow.io/auth/realms/agsw/protocol/openid-connect/token" - - - - ' Private Shared ReadOnly TOKEN_ENDPOINT As String = "https://dev-kc.singlewindow.io/auth/realms/agsw/protocol/openid-connect/token" - - - ' curl --location 'https://login.singlewindow.io/auth/realms/agsw/protocol/openid-connect/token' \ - '--header 'Content-Type: application/x-www-form-urlencoded' \ - '--data-urlencode 'grant_type=password' \ - '--data-urlencode 'password=Dhub1234*' \ - '--data-urlencode 'username=dhub@verag.ag' \ - '--data-urlencode 'client_id=agsw-admin' - - + Private Shared ReadOnly TOKEN_ENDPOINT_PROD As String = "https://login.singlewindow.io/auth/realms/agsw/protocol/openid-connect/token" + Private Shared ReadOnly TOKEN_ENDPOINT_TEST As String = "https://dev-kc.singlewindow.io/auth/realms/agsw/protocol/openid-connect/token" Private Shared ReadOnly CLIENT_ID As String = "agsw-admin" - ' Gewünscht: Zugangsdaten in der Klasse definieren - Private Shared ReadOnly USERNAME As String = "dhub@verag.ag" '"andreas.test@test.com" - Private Shared ReadOnly PASSWORD As String = "Dhub1234*" '"Password.123" + Private Shared ReadOnly USERNAME_PROD As String = "dhub@verag.ag" + Private Shared ReadOnly PASSWORD_PROD As String = "Dhub1234*" - ' Token-File pro Benutzer unter %AppData% - Private Shared ReadOnly StorePath As String = - Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "RelayHub", "token.json") + Private Shared ReadOnly USERNAME_TEST As String = "andreas.test@test.com" + Private Shared ReadOnly PASSWORD_TEST As String = "Atez123." - ' Sicherheitspuffer, bevor wir erneuern (Sekunden) Private Const ExpirySkewSeconds As Integer = 60 - ' ======= ÖFFENTLICHE API ======= - ''' - ''' Liefert einen gültigen Access Token (nie Leerstring). - ''' - Public Shared Function GetAccessToken() As String - Dim store = LoadStore() + '====================================================================== + ' KONFIGURATION + '====================================================================== + Private Shared Function GetTokenEndpoint(environment As cRelayHubEnvironment) As String + Select Case environment + Case cRelayHubEnvironment.TEST + Return TOKEN_ENDPOINT_TEST + Case cRelayHubEnvironment.PROD + Return TOKEN_ENDPOINT_PROD + Case Else + Throw New ApplicationException("Unbekannte RelayHub-Umgebung.") + End Select + End Function + + Private Shared Function GetUsername(environment As cRelayHubEnvironment) As String + Select Case environment + Case cRelayHubEnvironment.TEST + Return USERNAME_TEST + Case cRelayHubEnvironment.PROD + Return USERNAME_PROD + Case Else + Throw New ApplicationException("Unbekannte RelayHub-Umgebung.") + End Select + End Function + + Private Shared Function GetPassword(environment As cRelayHubEnvironment) As String + Select Case environment + Case cRelayHubEnvironment.TEST + Return PASSWORD_TEST + Case cRelayHubEnvironment.PROD + Return PASSWORD_PROD + Case Else + Throw New ApplicationException("Unbekannte RelayHub-Umgebung.") + End Select + End Function + + Private Shared Function GetStorePath(environment As cRelayHubEnvironment) As String + Dim fileName As String = If(environment = cRelayHubEnvironment.TEST, "token_test.json", "token_prod.json") + Return Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData), "RelayHub", fileName) + End Function + + '====================================================================== + ' ACCESS TOKEN + '====================================================================== + Public Shared Function GetAccessToken(environment As cRelayHubEnvironment) As String + Dim store = LoadStore(environment) - ' 1) Wenn wir einen (noch) gültigen Token haben If store IsNot Nothing AndAlso Not String.IsNullOrWhiteSpace(store.AccessToken) Then - If store.ExpiresAtUtc > DateTimeOffset.UtcNow.AddSeconds(ExpirySkewSeconds) Then - Return store.AccessToken - End If + If store.ExpiresAtUtc > DateTimeOffset.UtcNow.AddSeconds(ExpirySkewSeconds) Then Return store.AccessToken End If - ' 2) Versuche Refresh, falls vorhanden - If store IsNot Nothing AndAlso Not String.IsNullOrWhiteSpace(store.RefreshToken) Then - store = TryRefresh(store.RefreshToken) - End If + If store IsNot Nothing AndAlso Not String.IsNullOrWhiteSpace(store.RefreshToken) Then store = TryRefresh(store.RefreshToken, environment) - ' 3) Fallback: Password-Grant Login - If store Is Nothing OrElse String.IsNullOrWhiteSpace(store.AccessToken) Then - store = PasswordLogin() - End If + If store Is Nothing OrElse String.IsNullOrWhiteSpace(store.AccessToken) Then store = PasswordLogin(environment) - ' Validierung - If store Is Nothing OrElse String.IsNullOrWhiteSpace(store.AccessToken) Then - Throw New ApplicationException("Konnte keinen gültigen Access Token erhalten (leer).") - End If + If store Is Nothing OrElse String.IsNullOrWhiteSpace(store.AccessToken) Then Throw New ApplicationException("Konnte keinen gültigen Access Token erhalten (" & environment.ToString() & ").") - ' Persistieren & zurück - SaveStore(store) + SaveStore(store, environment) Return store.AccessToken End Function - ' ======= INTERNES ======= - Private Shared Function PasswordLogin() As TokenStore + '====================================================================== + ' LOGIN + '====================================================================== + Private Shared Function PasswordLogin(environment As cRelayHubEnvironment) As TokenStore Dim form = New Dictionary(Of String, String) From { {"grant_type", "password"}, - {"username", USERNAME}, - {"password", PASSWORD}, + {"username", GetUsername(environment)}, + {"password", GetPassword(environment)}, {"client_id", CLIENT_ID} } - Dim resp = PostForm(form) - Dim token = ParseTokenResponse(resp) - - Return token + Dim resp = PostForm(form, environment) + Return ParseTokenResponse(resp, environment) End Function - Private Shared Function TryRefresh(refreshToken As String) As TokenStore + '====================================================================== + ' REFRESH + '====================================================================== + Private Shared Function TryRefresh(refreshToken As String, environment As cRelayHubEnvironment) As TokenStore Try Dim form = New Dictionary(Of String, String) From { {"grant_type", "refresh_token"}, {"refresh_token", refreshToken}, {"client_id", CLIENT_ID} } - Dim resp = PostForm(form) - Dim token = ParseTokenResponse(resp) - ' Nur speichern, wenn ein Access Token vorhanden ist + Dim resp = PostForm(form, environment) + Dim token = ParseTokenResponse(resp, environment) + If Not String.IsNullOrWhiteSpace(token.AccessToken) Then - SaveStore(token) + SaveStore(token, environment) Return token End If Catch ex As Exception - ' Ignorieren -> fällt auf PasswordLogin zurück + Console.WriteLine("Token Refresh fehlgeschlagen (" & environment.ToString() & "): " & ex.Message) End Try Return Nothing End Function - Private Shared Function PostForm(formFields As Dictionary(Of String, String)) As String + '====================================================================== + ' HTTP + '====================================================================== + Private Shared Function PostForm(formFields As Dictionary(Of String, String), environment As cRelayHubEnvironment) As String Using client As New HttpClient() Using content As New FormUrlEncodedContent(formFields) - Dim response = client.PostAsync(TOKEN_ENDPOINT, content).Result + Dim tokenEndpoint As String = GetTokenEndpoint(environment) + + Dim username As String = GetUsername(environment) + Dim password As String = GetPassword(environment) + + Console.WriteLine("") + Console.WriteLine("==================================================") + Console.WriteLine(" RELAYHUB TOKEN REQUEST") + Console.WriteLine("==================================================") + Console.WriteLine("Environment : " & environment.ToString()) + Console.WriteLine("Token Endpoint : " & tokenEndpoint) + Console.WriteLine("Client ID : " & CLIENT_ID) + 'Console.WriteLine("Username : " & username) + 'Console.WriteLine("Password : " & password) + 'Console.WriteLine("Password Länge : " & If(password Is Nothing, 0, password.Length)) + 'Console.WriteLine("Grant Type : " & If(formFields.ContainsKey("grant_type"), formFields("grant_type"), "")) + 'Console.WriteLine("Token Store : " & GetStorePath(environment)) + 'Console.WriteLine("==================================================") + + + Dim response = client.PostAsync(tokenEndpoint, content).Result Dim body = response.Content.ReadAsStringAsync().Result - If Not response.IsSuccessStatusCode Then - Throw New ApplicationException( - $"Token-Endpoint Fehler ({CInt(response.StatusCode)}): {body}") - End If + If Not response.IsSuccessStatusCode Then Throw New ApplicationException("Token-Endpoint Fehler (" & environment.ToString() & " / " & CInt(response.StatusCode) & "): " & body) Return body End Using End Using End Function - Private Shared Function ParseTokenResponse(json As String) As TokenStore + '====================================================================== + ' TOKEN RESPONSE + '====================================================================== + Private Shared Function ParseTokenResponse(json As String, environment As cRelayHubEnvironment) As TokenStore Dim r = JsonConvert.DeserializeObject(Of TokenResponse)(json) - If r Is Nothing OrElse String.IsNullOrWhiteSpace(r.access_token) Then - Throw New ApplicationException("Token-Antwort ungültig oder ohne access_token.") - End If + If r Is Nothing OrElse String.IsNullOrWhiteSpace(r.access_token) Then Throw New ApplicationException("Token-Antwort ungültig oder ohne access_token.") Dim now = DateTimeOffset.UtcNow - Dim expiresIn = If(r.expires_in <= 0, 3600, r.expires_in) ' Fallback 1h + Dim expiresIn = If(r.expires_in <= 0, 3600, r.expires_in) Dim store = New TokenStore With { - .AccessToken = r.access_token.Trim(), - .RefreshToken = If(r.refresh_token, String.Empty), - .ExpiresAtUtc = now.AddSeconds(expiresIn) - } + .AccessToken = r.access_token.Trim(), + .RefreshToken = If(r.refresh_token, String.Empty), + .ExpiresAtUtc = now.AddSeconds(expiresIn) + } - ' === Konsolen-Ausgabe === - Console.WriteLine("== Neuer Token erhalten ==") - Console.WriteLine("Access Token: " & store.AccessToken) - Console.WriteLine("Refresh Token: " & store.RefreshToken) + Console.WriteLine("== Neuer RelayHub Token ==") + Console.WriteLine("Environment: " & environment.ToString()) Console.WriteLine("Gültig bis UTC: " & store.ExpiresAtUtc.ToString("yyyy-MM-dd HH:mm:ss")) Return store End Function - ' ======= PERSISTENZ ======= - Private Shared Function LoadStore() As TokenStore + '====================================================================== + ' TOKEN LADEN + '====================================================================== + Private Shared Function LoadStore(environment As cRelayHubEnvironment) As TokenStore Try - If File.Exists(StorePath) Then - Dim json = File.ReadAllText(StorePath, Encoding.UTF8) + Dim storePath As String = GetStorePath(environment) + + If File.Exists(storePath) Then + Dim json = File.ReadAllText(storePath, Encoding.UTF8) Dim s = JsonConvert.DeserializeObject(Of TokenStore)(json) - ' Ausgabe in Konsole + If s IsNot Nothing Then Console.WriteLine("== Token aus Datei geladen ==") - Console.WriteLine("Access Token: " & (If(String.IsNullOrWhiteSpace(s.AccessToken), "", s.AccessToken))) - Console.WriteLine("Refresh Token: " & (If(String.IsNullOrWhiteSpace(s.RefreshToken), "", s.RefreshToken))) + Console.WriteLine("Environment: " & environment.ToString()) Console.WriteLine("Gültig bis UTC: " & s.ExpiresAtUtc.ToString("yyyy-MM-dd HH:mm:ss")) End If + Return s Else - ' Datei existiert nicht -> Info ausgeben - Console.WriteLine("Keine Token-Datei vorhanden, neuer Login erforderlich.") + Console.WriteLine("Keine Token-Datei für " & environment.ToString() & " vorhanden.") End If Catch ex As Exception Console.WriteLine("Fehler beim Laden der Token-Datei: " & ex.Message) - ' Datei defekt? -> Ignorieren, neu holen End Try + Return Nothing End Function - Private Shared Sub SaveStore(store As TokenStore) + '====================================================================== + ' TOKEN SPEICHERN + '====================================================================== + Private Shared Sub SaveStore(store As TokenStore, environment As cRelayHubEnvironment) Try - Dim dir = Path.GetDirectoryName(StorePath) + Dim storePath As String = GetStorePath(environment) + Dim dir = Path.GetDirectoryName(storePath) + If Not Directory.Exists(dir) Then Directory.CreateDirectory(dir) - ' Datei immer neu schreiben/überschreiben Dim json = JsonConvert.SerializeObject(store, Formatting.Indented) - File.WriteAllText(StorePath, json, Encoding.UTF8) + File.WriteAllText(storePath, json, Encoding.UTF8) - Console.WriteLine("Token-Datei gespeichert: " & StorePath) + Console.WriteLine("Token-Datei gespeichert: " & storePath) Catch ex As Exception Console.WriteLine("Fehler beim Speichern der Token-Datei: " & ex.Message) End Try End Sub - Public Shared Sub DeleteStore() + '====================================================================== + ' TOKEN LÖSCHEN + '====================================================================== + Private Shared Sub Delete_Store(Optional environment As cRelayHubEnvironment = cRelayHubEnvironment.PROD) Try - If System.IO.File.Exists(StorePath) Then System.IO.File.Delete(StorePath) - - Console.WriteLine("Token-Datei gelöscht: " & StorePath) + Dim storePath As String = GetStorePath(environment) + If File.Exists(storePath) Then File.Delete(storePath) + Console.WriteLine("Token-Datei gelöscht: " & storePath) Catch ex As Exception Console.WriteLine("Fehler beim Löschen der Token-Datei: " & ex.Message) End Try End Sub + Public Shared Sub DeleteAllStores() + Delete_Store(cRelayHubEnvironment.TEST) + Delete_Store(cRelayHubEnvironment.PROD) + End Sub - - ' ======= DTOs ======= + '====================================================================== + ' DTOs + '====================================================================== Private Class TokenResponse Public Property access_token As String Public Property expires_in As Integer @@ -211,7 +257,6 @@ Public Class cRelayHubToken Public Property refresh_token As String Public Property token_type As String Public Property scope As String - ' … weitere Felder bei Bedarf End Class Private Class TokenStore @@ -220,4 +265,4 @@ Public Class cRelayHubToken Public Property ExpiresAtUtc As DateTimeOffset End Class -End Class +End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb index e305b779..05dc99df 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb @@ -126,6 +126,10 @@ Public Class cATEZ_Read_T1 End Function + Public Function ProcessPdf(pdfPath As String) As T1ProcessResult + Return ProcessPdfAsync(pdfPath).GetAwaiter().GetResult() + End Function + ' ========================== ' PROCESS PDF