diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f1ea3a4b..3d1a9500 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index b4a01d96..e9608123 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -2701,6 +2701,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property xml() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("xml", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property xml_gray() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("xml_gray", 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 c90b509b..666a3dee 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -145,9 +145,6 @@ ..\Resources\brexit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\air-pollution.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -184,8 +181,11 @@ ..\Resources\ambar_simple.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\email_big.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\dakosy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,6 +205,9 @@ ..\Resources\food1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stift1.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 @@ -220,9 +223,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 @@ -244,8 +244,8 @@ ..\Resources\android-add-contact.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 + + ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\sdl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,8 +283,11 @@ ..\Resources\Atilla.jpg;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\therefore1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cbam_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,6 +298,9 @@ ..\Resources\person_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\xml.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 @@ -349,8 +355,8 @@ ..\Resources\lorry_motion.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\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 @@ -358,9 +364,6 @@ ..\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 - F:\Grafik\VERAG\AEO\aeo_CS.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -376,9 +379,6 @@ ..\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 @@ -406,8 +406,8 @@ ..\Resources\aktiveVeredelung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\therefore1.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 ..\Resources\Abrechnung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -442,9 +442,6 @@ ..\Resources\Excel_2013_logo-155x110.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\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -469,15 +466,12 @@ ..\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\toll-collect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\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\info.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 @@ -496,15 +490,18 @@ ..\Resources\checklist.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 + ..\Resources\data.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\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\pay_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -532,8 +529,11 @@ ..\Resources\belegEUR1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WAI.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 + + + ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-AG-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -541,6 +541,9 @@ ..\Resources\minus.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 + ..\Resources\uhr_notime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -556,9 +559,6 @@ ..\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\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -577,8 +577,8 @@ ..\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 @@ -598,8 +598,8 @@ ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\air-pollution.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\beleg_rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -649,11 +649,14 @@ ..\Resources\statistik1.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\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\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -679,15 +682,21 @@ ..\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\stift1.png;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 + + + ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\creditsafe_add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -718,8 +727,8 @@ ..\Resources\Route3.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 + + ..\Resources\compose.png;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 @@ -799,8 +808,8 @@ ..\Resources\pdf1.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\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 @@ -811,8 +820,8 @@ ..\Resources\email_big1.png;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 @@ -838,14 +847,14 @@ ..\Resources\verag_only.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 + + ..\Resources\Verag-AG-Logo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-Customs-Service-GMBH-Logo2.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 @@ -862,8 +871,8 @@ ..\..\..\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\IMEX-LOGO_simple.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 @@ -895,8 +904,8 @@ ..\Resources\checklist.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 + + ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\food2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -910,10 +919,7 @@ ..\Resources\durmaz.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cbam_s.png;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 + + ..\Resources\xml_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SDL/Resources/xml.jpg b/SDL/Resources/xml.jpg new file mode 100644 index 00000000..a3bef99e Binary files /dev/null and b/SDL/Resources/xml.jpg differ diff --git a/SDL/Resources/xml_gray.jpg b/SDL/Resources/xml_gray.jpg new file mode 100644 index 00000000..d6f10b80 Binary files /dev/null and b/SDL/Resources/xml_gray.jpg differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 02545800..fb722116 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4732,6 +4732,8 @@ + + diff --git a/SDL/kunden/usrCntlCBAM.Designer.vb b/SDL/kunden/usrCntlCBAM.Designer.vb index fdef39d9..9ed40b8f 100644 --- a/SDL/kunden/usrCntlCBAM.Designer.vb +++ b/SDL/kunden/usrCntlCBAM.Designer.vb @@ -62,7 +62,13 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DHF_VERAG_Copy = New System.Windows.Forms.Button() Me.btnCBAM_DS_DHF_UNISPED_Copy = New System.Windows.Forms.Button() Me.btnCBAM_DS_TELOTEC_Copy = New System.Windows.Forms.Button() + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.cbxVERAG = New System.Windows.Forms.CheckBox() + Me.btnCBAM_DS_DAKOSY_XML = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() Me.cntxtAddSdl.SuspendLayout() + Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' 'lblOffert @@ -511,9 +517,9 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_DAKOSY_Copy.Enabled = False Me.btnCBAM_DS_DAKOSY_Copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCBAM_DS_DAKOSY_Copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(144, 312) + Me.btnCBAM_DS_DAKOSY_Copy.Location = New System.Drawing.Point(106, 312) Me.btnCBAM_DS_DAKOSY_Copy.Name = "btnCBAM_DS_DAKOSY_Copy" - Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DAKOSY_Copy.Size = New System.Drawing.Size(168, 42) Me.btnCBAM_DS_DAKOSY_Copy.TabIndex = 35 Me.btnCBAM_DS_DAKOSY_Copy.Text = "In Zwischenablage kopieren" Me.btnCBAM_DS_DAKOSY_Copy.UseVisualStyleBackColor = True @@ -554,11 +560,70 @@ Partial Class usrCntlCBAM Me.btnCBAM_DS_TELOTEC_Copy.Text = "In Zwischenablage kopieren" Me.btnCBAM_DS_TELOTEC_Copy.UseVisualStyleBackColor = True ' + 'MyPanel1 + ' + Me.MyPanel1.Controls.Add(Me.cbxVERAG) + Me.MyPanel1.Location = New System.Drawing.Point(98, 4) + Me.MyPanel1.Name = "MyPanel1" + Me.MyPanel1.Size = New System.Drawing.Size(590, 28) + Me.MyPanel1.TabIndex = 39 + ' + 'cbxVERAG + ' + Me.cbxVERAG.AutoSize = True + Me.cbxVERAG.Location = New System.Drawing.Point(8, 6) + Me.cbxVERAG.Name = "cbxVERAG" + Me.cbxVERAG.Size = New System.Drawing.Size(63, 17) + Me.cbxVERAG.TabIndex = 0 + Me.cbxVERAG.Text = "VERAG" + Me.cbxVERAG.UseVisualStyleBackColor = True + ' + 'btnCBAM_DS_DAKOSY_XML + ' + Me.btnCBAM_DS_DAKOSY_XML.Enabled = False + Me.btnCBAM_DS_DAKOSY_XML.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCBAM_DS_DAKOSY_XML.Image = Global.SDL.My.Resources.Resources.xml + Me.btnCBAM_DS_DAKOSY_XML.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnCBAM_DS_DAKOSY_XML.Location = New System.Drawing.Point(144, 378) + Me.btnCBAM_DS_DAKOSY_XML.Name = "btnCBAM_DS_DAKOSY_XML" + Me.btnCBAM_DS_DAKOSY_XML.Size = New System.Drawing.Size(130, 42) + Me.btnCBAM_DS_DAKOSY_XML.TabIndex = 40 + Me.btnCBAM_DS_DAKOSY_XML.Text = "XML" + Me.btnCBAM_DS_DAKOSY_XML.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.Enabled = False + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(144, 426) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(130, 42) + Me.Button2.TabIndex = 42 + Me.Button2.Text = "In Zwischenablage kopieren" + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.Enabled = False + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button3.Location = New System.Drawing.Point(106, 474) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(168, 42) + Me.Button3.TabIndex = 43 + Me.Button3.Text = "Alles in Zwischenablage kopieren" + Me.Button3.UseVisualStyleBackColor = True + ' 'usrCntlCBAM ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.Button3) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.btnCBAM_DS_DAKOSY_XML) + Me.Controls.Add(Me.MyPanel1) Me.Controls.Add(Me.btnCBAM_DS_TELOTEC_Copy) Me.Controls.Add(Me.btnCBAM_DS_DHF_UNISPED_Copy) Me.Controls.Add(Me.btnCBAM_DS_DHF_VERAG_Copy) @@ -600,6 +665,8 @@ Partial Class usrCntlCBAM Me.Name = "usrCntlCBAM" Me.Size = New System.Drawing.Size(1041, 576) Me.cntxtAddSdl.ResumeLayout(False) + Me.MyPanel1.ResumeLayout(False) + Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -643,4 +710,9 @@ Partial Class usrCntlCBAM Friend WithEvents btnCBAM_DS_DHF_VERAG_Copy As Button Friend WithEvents btnCBAM_DS_DHF_UNISPED_Copy As Button Friend WithEvents btnCBAM_DS_TELOTEC_Copy As Button + Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel + Friend WithEvents cbxVERAG As CheckBox + Friend WithEvents btnCBAM_DS_DAKOSY_XML As Button + Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button End Class diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index dc2d88a7..f5eb0e8d 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -23,14 +23,16 @@ Public Class usrCntlCBAM txtCBAMPruef_DAKOSY.Text = "-" Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor + 'isnull( eza_anmeldedatum, eza_Trans_DatumZeit) Dim SQLSTR = " SELECT COUNT(*) FROM [tblDakosy_EZA] inner join tblDakosy_EZA_Warenposition on ezaWP_EzaId=eza_Id - where isnull( eza_anmeldedatum, eza_Trans_DatumZeit) between '" & txtVon._value & "' and '" & txtBis._value & "' + where eza_anmeldedatum between '" & txtVon._value & "' and '" & txtBis._value & "' and ( left(ezaWP_WarennummerEZT,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) @@ -48,10 +50,19 @@ Public Class usrCntlCBAM OR ezaWP_WarennummerEZT like '280410%' ) and ezaWP_WarennummerEZT not like '310560%' - and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' - and eza_status between 41 and 60 + and eza_status between 50 and 60 " + If cbxVERAG.Checked Then + SQLSTR &= " + and eza_VertretungsVerhaeltnisCode=2 + " + Else + SQLSTR &= " + and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' + " + End If + Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then txtCBAMPruef_DAKOSY.Text = dt.Rows(0)(0) & " Einträge" @@ -79,6 +90,7 @@ Public Class usrCntlCBAM txtCBAMPruef_DHF_VERAG.Text = "-" Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -86,7 +98,8 @@ Public Class usrCntlCBAM Dim SQLSTR = " select COUNT(*) from zsAnmRefs - inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID @@ -108,9 +121,20 @@ Public Class usrCntlCBAM OR ComCd like '280410%' ) and ComCd not like '310560%' - and crn is not null - and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) = '" & EORI & "' - " + and crn is not null + and zsAnmDHFRefs.ErledigungsTypID like 'F%' + " + + If cbxVERAG.Checked Then + SQLSTR &= " + and DecRep IN(3) + + " + Else + SQLSTR &= " + and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) = '" & EORI & "' + " + End If Dim dt = SQL.loadDgvBySql(SQLSTR, "EZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then @@ -131,6 +155,7 @@ Public Class usrCntlCBAM txtCBAMPruef_DHF_UNISPED.Text = "-" Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -138,7 +163,8 @@ Public Class usrCntlCBAM Dim SQLSTR = " select COUNT(*) from zsAnmRefs - inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID @@ -161,8 +187,20 @@ Public Class usrCntlCBAM ) and ComCd not like '310560%' and crn is not null - and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) = '" & EORI & "' - " + and zsAnmDHFRefs.ErledigungsTypID like 'F%' + " + + + If cbxVERAG.Checked Then + SQLSTR &= " + and DecRep IN(3) + " + Else + SQLSTR &= " + and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) = '" & EORI & "' + " + End If + Dim dt = SQL.loadDgvBySql(SQLSTR, "EZOLL_UNISPED", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then @@ -184,6 +222,7 @@ Public Class usrCntlCBAM Exit Sub Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub Me.Cursor = Cursors.WaitCursor Dim SQLSTR = " @@ -252,6 +291,7 @@ Public Class usrCntlCBAM Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -276,7 +316,7 @@ Public Class usrCntlCBAM FROM [VERAG].[dbo].[tblDakosy_EZA] inner join tblDakosy_EZA_Warenposition on ezaWP_EzaId=eza_Id where - isnull( eza_anmeldedatum, eza_Trans_DatumZeit) between '" & txtVon._value & "' and '" & txtBis._value & "' + eza_anmeldedatum between '" & txtVon._value & "' and '" & txtBis._value & "' and ( left(ezaWP_WarennummerEZT,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) @@ -294,11 +334,24 @@ Public Class usrCntlCBAM OR ezaWP_WarennummerEZT like '280410%' ) and ezaWP_WarennummerEZT not like '310560%' - and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' - and eza_status between 41 and 60 - order by Absender,eza_ANR, tblDakosy_EZA_Warenposition.ezaWP_PositionsNummer + and eza_status between 50 and 60 + " + + If cbxVERAG.Checked Then + SQLSTR &= " + and eza_VertretungsVerhaeltnisCode=2 + " + Else + SQLSTR &= " + and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' + " + End If + + SQLSTR &= " order by Absender,eza_ANR, tblDakosy_EZA_Warenposition.ezaWP_PositionsNummer" + + Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) @@ -325,6 +378,7 @@ Public Class usrCntlCBAM Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -336,7 +390,7 @@ Public Class usrCntlCBAM FROM [VERAG].[dbo].[tblDakosy_EZA] inner join tblDakosy_EZA_Warenposition on ezaWP_EzaId=eza_Id where - isnull( eza_anmeldedatum, eza_Trans_DatumZeit) between '" & txtVon._value & "' and '" & txtBis._value & "' + eza_anmeldedatum between '" & txtVon._value & "' and '" & txtBis._value & "' and ( left(ezaWP_WarennummerEZT,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) @@ -355,11 +409,23 @@ Public Class usrCntlCBAM ) and ezaWP_WarennummerEZT not like '310560%' - and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' - and eza_status between 41 and 60 - group by eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8) + and eza_status between 50 and 60 + " + If cbxVERAG.Checked Then + SQLSTR &= " + and eza_VertretungsVerhaeltnisCode=2 + " + Else + SQLSTR &= " + and (select isnull([ezaAd_NameFirma1],[ezaAd_TeilnehmerEORI]) FROM tblDakosy_EZA_Adressen WHERE ezaAd_EZAId=eza_Id and [ezaAd_AdressTyp]='CN')='" & EORI & "' + " + End If + + SQLSTR &= " group by eza_VersendungsLandCode,left(ezaWP_WarennummerEZT,8)" + + Dim dt = SQL.loadDgvBySql(SQLSTR, "FMZOLL", 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Summenbericht_" & txtVon._value & "-" & txtBis._value) @@ -373,15 +439,67 @@ Public Class usrCntlCBAM + '----- XML ---------------------------------------------------------------------------------------------------------------------------------------- + + btnCBAM_DS_DAKOSY_XML.Enabled = False + btnCBAM_DS_DAKOSY_XML.Tag = "" + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + + Dim CBAM_XML As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.QReportType + + CBAM_XML.Year = txtJahr.Text + CBAM_XML.ReportingPeriod = cboQuartal._value + + For Each g In dt.Rows + Dim GOODS As New VERAG_PROG_ALLGEMEIN.CBAM_QReport_17.ImportedGoodType + GOODS.CommodityCode.HsCode = g("Tarifnummer").ToString.Substring(0, 6) + GOODS.CommodityCode.CnCode = g("Tarifnummer").ToString.Substring(6, 2) + GOODS.OriginCountry.Country = g("VersendungsLand") + GOODS.MeasureImported.NetMass = g("Eigenmasse") + GOODS.MeasureImported.MeasurementUnit = "KG" + CBAM_XML.ImportedGood.Add(GOODS) + Next + + Dim optFileName = EORI & "_XML_" & txtVon._value & "-" & txtBis._value + Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName + If Not My.Computer.FileSystem.DirectoryExists(sPath) Then + My.Computer.FileSystem.CreateDirectory(sPath) + End If + + Dim filename = sPath & optFileName & ".xml" + While System.IO.File.Exists(filename) + filename = sPath & optFileName & Now.ToString("ddMMyyyyHHmmss") & ".xml" + End While + + + CBAM_XML.SaveToFile(filename) + btnCBAM_DS_DAKOSY_XML.Tag = filename + btnCBAM_DS_DAKOSY_XML.Enabled = True + + Me.Cursor = Cursors.WaitCursor + + End If + + + '--------------------------------------------------------------------------------------------------------------------------------------------- + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try + + + + + Me.Cursor = Cursors.Default End Sub Private Sub btnCBAM_DS_DAKOSY_Deteil_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_Deteil.Click, btnCBAM_DS_DAKOSY_Summe.Click, btnCBAM_DS_DHF_VERAG_Deteil.Click, - btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click + btnCBAM_DS_DHF_VERAG_Summe.Click, btnCBAM_DS_DHF_UNISPED_Deteil.Click, btnCBAM_DS_DHF_UNISPED_Summe.Click, btnCBAM_DS_TELOTEC_Detail.Click, btnCBAM_DS_TELOTEC_Summe.Click, + btnCBAM_DS_DAKOSY_XML.Click + If sender.tag <> "" Then Try : Process.Start(sender.tag) : Catch : End Try End If @@ -439,13 +557,23 @@ Public Class usrCntlCBAM End If End Sub - Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click - btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False - btnCBAM_DS_DHF_VERAG_Copy.Enabled = False - btnCBAM_DS_DHF_VERAG_Deteil.Tag = "" + Private Sub btnCBAM_DS_DHF_VERAG_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DHF_VERAG.Click, btnCBAM_DS_DHF_UNISPED.Click + Dim EZOLL_SQL = "EZOLL" + If sender Is btnCBAM_DS_DHF_VERAG Then + btnCBAM_DS_DHF_VERAG_Deteil.Enabled = False + btnCBAM_DS_DHF_VERAG_Copy.Enabled = False + btnCBAM_DS_DHF_VERAG_Deteil.Tag = "" + End If + If sender Is btnCBAM_DS_DHF_UNISPED Then + btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = False + btnCBAM_DS_DHF_UNISPED_Copy.Enabled = False + btnCBAM_DS_DHF_UNISPED_Deteil.Tag = "" + EZOLL_SQL = "EZOLL_UNISPED" + End If Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -460,7 +588,8 @@ Public Class usrCntlCBAM , isnull((SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')EORI_Empfänger , isnull((SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )),'')Empfänger from zsAnmRefs - inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID @@ -483,19 +612,38 @@ Public Class usrCntlCBAM ) and ComCd not like '310560%' and crn is not null - and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' - order by (SELECT Na FROM zsAnmConorTra WHERE (zsAnmConorTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConorTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConorTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConorTra.AnmID = zsAnmHea.AnmID )) - " + and zsAnmDHFRefs.ErledigungsTypID like 'F%' + " - Dim dt = SQL.loadDgvBySql(SQLSTR, "EZOLL", 600) + + If cbxVERAG.Checked Then + SQLSTR &= " + and DecRep IN(3) + " + Else + SQLSTR &= " + and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' + " + End If + + SQLSTR &= " order by Absender" + + Dim dt = SQL.loadDgvBySql(SQLSTR, EZOLL_SQL, 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DHF_VERAG_Deteil.Tag = path - btnCBAM_DS_DHF_VERAG_Deteil.Enabled = True - btnCBAM_DS_DHF_VERAG_Copy.Enabled = True + If sender Is btnCBAM_DS_DHF_VERAG Then + btnCBAM_DS_DHF_VERAG_Deteil.Tag = path + btnCBAM_DS_DHF_VERAG_Deteil.Enabled = True + btnCBAM_DS_DHF_VERAG_Copy.Enabled = True + End If + If sender Is btnCBAM_DS_DHF_UNISPED Then + btnCBAM_DS_DHF_UNISPED_Deteil.Tag = path + btnCBAM_DS_DHF_UNISPED_Deteil.Enabled = True + btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True + End If Me.Cursor = Cursors.Default - End If + End If @@ -508,11 +656,19 @@ Public Class usrCntlCBAM '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - btnCBAM_DS_DHF_VERAG_Summe.Enabled = False - btnCBAM_DS_DHF_VERAG_Summe.Tag = "" + If sender Is btnCBAM_DS_DHF_VERAG Then + btnCBAM_DS_DHF_VERAG_Summe.Enabled = False + btnCBAM_DS_DHF_VERAG_Summe.Tag = "" + End If + + If sender Is btnCBAM_DS_DHF_UNISPED Then + btnCBAM_DS_DHF_UNISPED_Summe.Enabled = False + btnCBAM_DS_DHF_UNISPED_Summe.Tag = "" + End If Try Dim EORI = txtEori.Text + If cbxVERAG.Checked Then EORI = "VERAG" If EORI = "" Then MsgBox("EORI eingeben!") : Exit Sub If txtVon._value = "" Then MsgBox("Datum von eingeben!") : Exit Sub If txtBis._value = "" Then MsgBox("Datum bis eingeben!") : Exit Sub @@ -521,7 +677,8 @@ Public Class usrCntlCBAM Dim SQLSTR = " select left(zsAnmGdsitem.ComCd,8) Tarifnummer, sum(Net)Eigenmasse, sum(ItVal)Rechnungspreis,Orig from zsAnmRefs - inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDHFRefs on zsAnmRefs.LizenzNr=zsAnmDHFRefs.LizenzNr and zsAnmRefs.AnmID=zsAnmDHFRefs.AnmID and zsAnmRefs.VorgangID=zsAnmDHFRefs.VorgangID and zsAnmRefs.OperatorID=zsAnmDHFRefs.OperatorID + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID @@ -544,17 +701,34 @@ Public Class usrCntlCBAM ) and ComCd not like '310560%' and crn is not null - and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' - GROUP BY Orig,left(zsAnmGdsitem.ComCd,8) + and zsAnmDHFRefs.ErledigungsTypID like 'F%' " - Dim dt = SQL.loadDgvBySql(SQLSTR, "EZOLL", 600) + If cbxVERAG.Checked Then + SQLSTR &= " + and DecRep IN(3) + " + Else + SQLSTR &= " + and (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) LIKE '" & EORI & "' + " + End If + SQLSTR &= " GROUP BY Orig,left(zsAnmGdsitem.ComCd,8) " + + + Dim dt = SQL.loadDgvBySql(SQLSTR, EZOLL_SQL, 600) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Summenbericht_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DHF_VERAG_Summe.Tag = path - btnCBAM_DS_DHF_VERAG_Summe.Enabled = True - btnCBAM_DS_DHF_VERAG_Copy.Enabled = True - + If sender Is btnCBAM_DS_DHF_VERAG Then + btnCBAM_DS_DHF_VERAG_Summe.Tag = path + btnCBAM_DS_DHF_VERAG_Summe.Enabled = True + btnCBAM_DS_DHF_VERAG_Copy.Enabled = True + End If + If sender Is btnCBAM_DS_DHF_UNISPED Then + btnCBAM_DS_DHF_UNISPED_Summe.Tag = path + btnCBAM_DS_DHF_UNISPED_Summe.Enabled = True + btnCBAM_DS_DHF_UNISPED_Copy.Enabled = True + End If Me.Cursor = Cursors.Default End If @@ -567,4 +741,42 @@ Public Class usrCntlCBAM Me.Cursor = Cursors.Default End Sub + + Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVERAG.CheckedChanged + txtEori.Enabled = Not cbxVERAG.Checked + End Sub + + Private Sub btnCBAM_DS_DAKOSY_XML_Click(sender As Object, e As EventArgs) Handles btnCBAM_DS_DAKOSY_XML.Click + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) + + End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Dim f As New List(Of String) + If btnCBAM_DS_DAKOSY_XML.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_XML.Tag) + + If f.Count > 0 Then + 'Zwischenablage + Clipboard.Clear() + Dim d As New DataObject(DataFormats.FileDrop, f.ToArray) + Clipboard.SetDataObject(d, True) + End If + End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Dim f As New List(Of String) + If btnCBAM_DS_DAKOSY_Deteil.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Deteil.Tag) + If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag) + If btnCBAM_DS_DAKOSY_XML.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_XML.Tag) + + If f.Count > 0 Then + 'Zwischenablage + Clipboard.Clear() + Dim d As New DataObject(DataFormats.FileDrop, f.ToArray) + Clipboard.SetDataObject(d, True) + End If + End Sub End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 0d521675..f3372492 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -221,7 +221,7 @@ Public Class usrCntlKundenuebersicht Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "ATILLA" btncheckliste.Visible = False - tbcntrAllg.Visible = False + 'tbcntrAllg.Visible = False Case "IMEX" btnThereforeTarifNr.Visible = True ' btnThereforeTarifNr.Visible = False @@ -368,8 +368,12 @@ Public Class usrCntlKundenuebersicht usrCntlAnhaenge.Visible = True rtbAbf_Besonderheiten.Visible = True Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then KdFirma = KdFirma.Replace("VERAG", "ATILLA") ' WENN KD STAMM ATILLA GETRENNT --> diese Zeile löschen!!!!!! + + + If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - lblFirma.Text = KdFirma + lblFirma.Text = KdFirma lblFirma.Visible = True btnVMhinzufuegen.Enabled = False If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtignunen.vb b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtignunen.vb index 6db5e064..46a83bb7 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtignunen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtignunen.vb @@ -92,6 +92,8 @@ If ll.beroz_art = "G" And ll.beroz_bergrId = bb.berbgz_bergrId Then 'GruppenBerchtigung 'gefunden! If ll.beroz_berechtigungsstufe < berechtigungsstufe Then berechtigungsstufe = ll.beroz_berechtigungsstufe + ElseIf ll.beroz_art = "F" And ll.Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + If ll.beroz_berechtigungsstufe < berechtigungsstufe Then berechtigungsstufe = ll.beroz_berechtigungsstufe ElseIf ll.beroz_art = "N" And ll.Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then If ll.beroz_berechtigungsstufe < berechtigungsstufe Then berechtigungsstufe = ll.beroz_berechtigungsstufe ElseIf ll.beroz_art = "A" And ll.Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG Then diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/CBAM/QReport_v17.00.xsd b/VERAG_PROG_ALLGEMEIN/Schnittstellen/CBAM/QReport_v17.00.xsd index 586f9911..eaef3f24 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/CBAM/QReport_v17.00.xsd +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/CBAM/QReport_v17.00.xsd @@ -1,364 +1,359 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +