From b88155a445ad3f00c171ec831a1957a4e4feacbd Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 18 Dec 2023 15:28:36 +0100 Subject: [PATCH] TruckMaster --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/My Project/Resources.Designer.vb | 10 + SDL/My Project/Resources.resx | 229 +++--- SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb | 3 +- ...brptBriefSDL_PLOSE_truckmaster.Designer.vb | 194 ++++++ .../subrptBriefSDL_PLOSE_truckmaster.resx | 126 ++++ .../subrptBriefSDL_PLOSE_truckmaster.vb | 45 ++ SDL/Resources/plose_truckmaster.png | Bin 0 -> 5488 bytes SDL/SDL.vbproj | 19 + SDL/kunden/frmKundenblatt.vb | 6 +- SDL/kunden/usrCntlLKW.vb | 13 +- SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb | 4 +- ...SDLLeistungenPLOSE_TRUCKMASTER.Designer.vb | 650 ++++++++++++++++++ ...usrCntlSDLLeistungenPLOSE_TRUCKMASTER.resx | 120 ++++ .../usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb | 209 ++++++ SDL/mdm/frmNewData.Designer.vb | 27 +- SDL/mdm/frmNewData.vb | 3 +- SDL/mdm/usrCntlDatenDetails.vb | 11 + SDL/mdm/usrCntlKartenDaten.Designer.vb | 26 +- SDL/mdm/usrCntlKartenDaten.vb | 52 +- VERAG_PROG_ALLGEMEIN/Classes/SQL.vb | 15 +- VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb | 4 +- 22 files changed, 1636 insertions(+), 134 deletions(-) create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.Designer.vb create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.resx create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.vb create mode 100644 SDL/Resources/plose_truckmaster.png create mode 100644 SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.Designer.vb create mode 100644 SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.resx create mode 100644 SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f2b821ce..b3624e12 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 2de536e3..ae76fb64 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -1643,6 +1643,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property plose_truckmaster() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("plose_truckmaster", 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 e4a8f731..b8637c5a 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -154,17 +154,14 @@ ..\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\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\..\..\data\reloadFinance.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 @@ -172,17 +169,17 @@ ..\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\WAI.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\dakosy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,9 +199,6 @@ ..\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 @@ -241,9 +235,6 @@ ..\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 @@ -277,15 +268,15 @@ ..\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 ..\Resources\Atilla.jpg;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\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,6 +286,9 @@ ..\Resources\person_default.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 @@ -304,8 +298,14 @@ ..\Resources\email11.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\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 @@ -325,6 +325,9 @@ ..\Resources\frejus.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\Plakette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,17 +343,17 @@ ..\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\Route1_IR.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\zoll.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 @@ -358,6 +361,9 @@ ..\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 @@ -373,6 +379,9 @@ ..\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 @@ -388,9 +397,6 @@ ..\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 @@ -403,6 +409,9 @@ ..\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\viatoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -442,9 +451,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 @@ -454,18 +460,21 @@ ..\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\spedbuch1.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\search.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\Route4_IR.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 @@ -478,17 +487,17 @@ ..\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\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\pay_card.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\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -517,11 +526,8 @@ ..\Resources\belegEUR1.jpg;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\WAI.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 @@ -529,9 +535,6 @@ ..\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 @@ -544,11 +547,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\SBG.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 + + ..\..\..\..\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\woelfl.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -556,6 +565,9 @@ ..\Resources\android-note11.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 @@ -565,12 +577,15 @@ ..\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\email_print1.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 @@ -610,8 +625,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 @@ -628,20 +643,17 @@ ..\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 - - ..\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\search.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\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -664,11 +676,11 @@ ..\Resources\unisped_aeo_DE.jpg;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\Atilla _sig.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 + + ..\Resources\stift1.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 @@ -694,17 +706,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\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\..\..\data\awor.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 @@ -715,8 +724,8 @@ ..\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 @@ -724,8 +733,8 @@ ..\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 @@ -736,8 +745,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 @@ -745,20 +754,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 - ..\Resources\aeo.jpg;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 @@ -766,8 +772,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 @@ -775,17 +781,17 @@ ..\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\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\pfeil_rechts.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\modaltrans_original.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -796,8 +802,8 @@ ..\Resources\email_big1.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\vorauszahlung.png;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 @@ -823,8 +829,8 @@ ..\Resources\verag_only.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-AG-Logo2.png;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 @@ -838,8 +844,8 @@ ..\Resources\report.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\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\moneybag1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -850,8 +856,8 @@ ..\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 + + ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\VERAG-UNISPED-Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -865,11 +871,14 @@ ..\Resources\picboxZoomOut_Enter.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 - - ..\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 @@ -880,8 +889,8 @@ ..\Resources\checklist.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\Verag-AG-Logo21.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 @@ -892,13 +901,7 @@ ..\Resources\flagge_A.gif;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\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plose_truckmaster.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/Reports/MDM/BriefSDl/rptSDLBrief.vb b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb index 64dd26b2..73b7f9b7 100644 --- a/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb +++ b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb @@ -57,7 +57,8 @@ Public Class rptSDLBrief Case 214 : SubReport.Report = New subrptBriefSDL_PLOSE(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 215 : SubReport.Report = New subrptBriefSDL_PLOSE_IT(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 216 : SubReport.Report = New subrptBriefSDL_PLOSE_CZ(sqlStr & " AND SDLNr=" & sdlNr & " " & order) - Case 217 : SubReport.Report = New subrptBriefSDL_PLOSE_medpass(sqlStr & " AND SDLNr=" & sdlNr & " " & order) + Case 217 : SubReport.Report = New subrptBriefSDL_PLOSE_MEDPASS(sqlStr & " AND SDLNr=" & sdlNr & " " & order) + Case 218 : SubReport.Report = New subrptBriefSDL_PLOSE_truckmaster(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 501, 502 : SubReport.Report = New subrptBriefSDL_VERAGCARD(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case Else : MsgBox("Für diese Leistung kann kein Bericht erstellt werden!") End Select diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.Designer.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.Designer.vb new file mode 100644 index 00000000..7f2a40d8 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.Designer.vb @@ -0,0 +1,194 @@ + +Partial Public Class subrptBriefSDL_PLOSE_truckmaster + Inherits GrapeCity.ActiveReports.SectionReport + + 'Form overrides dispose to clean up the component list. + Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing Then + End If + MyBase.Dispose(disposing) + End Sub + + 'NOTE: The following procedure is required by the ActiveReports Designer + 'It can be modified using the ActiveReports Designer. + 'Do not modify it using the code editor. + Private WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail + + Private Sub InitializeComponent() + Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(subrptBriefSDL_PLOSE_truckmaster)) + Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.lblKartenNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblLKWKz = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblOBUId = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() + Me.TextBox5 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox6 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox7 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox11 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() + Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line() + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblKartenNr, Me.lblNr, Me.lblLKWKz, Me.lblOBUId}) + Me.Detail.Height = 0.1783464! + Me.Detail.Name = "Detail" + ' + 'lblKartenNr + ' + Me.lblKartenNr.Height = 0.1586614! + Me.lblKartenNr.Left = 1.732284! + Me.lblKartenNr.Name = "lblKartenNr" + Me.lblKartenNr.Style = "font-size: 10pt; font-weight: normal; text-align: left; ddo-char-set: 1" + Me.lblKartenNr.Text = "Karten-Nr" + Me.lblKartenNr.Top = 0.01968504! + Me.lblKartenNr.Width = 1.575984! + ' + 'lblNr + ' + Me.lblNr.Height = 0.1586614! + Me.lblNr.Left = 0.0! + Me.lblNr.Name = "lblNr" + Me.lblNr.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.lblNr.Style = "font-size: 10pt; text-align: right; ddo-char-set: 1" + Me.lblNr.Text = "999" + Me.lblNr.Top = 0.01968504! + Me.lblNr.Width = 0.3543307! + ' + 'lblLKWKz + ' + Me.lblLKWKz.Height = 0.1586614! + Me.lblLKWKz.Left = 0.3543298! + Me.lblLKWKz.Name = "lblLKWKz" + Me.lblLKWKz.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblLKWKz.Text = "SD 123 ASD" + Me.lblLKWKz.Top = 0.01968512! + Me.lblLKWKz.Width = 1.377953! + ' + 'lblOBUId + ' + Me.lblOBUId.Height = 0.1586614! + Me.lblOBUId.Left = 3.308267! + Me.lblOBUId.Name = "lblOBUId" + Me.lblOBUId.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblOBUId.Text = "OBUID" + Me.lblOBUId.Top = 0.01968512! + Me.lblOBUId.Width = 1.940551! + ' + 'GroupHeader1 + ' + Me.GroupHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.TextBox5, Me.TextBox6, Me.TextBox7, Me.TextBox11, Me.Line2}) + Me.GroupHeader1.Height = 0.1852909! + Me.GroupHeader1.Name = "GroupHeader1" + ' + 'TextBox5 + ' + Me.TextBox5.Height = 0.1586614! + Me.TextBox5.Left = 1.732284! + Me.TextBox5.Name = "TextBox5" + Me.TextBox5.Style = "font-size: 10pt; font-weight: bold; text-align: left; ddo-char-set: 1" + Me.TextBox5.Text = "Karten-Nr" + Me.TextBox5.Top = 0.0! + Me.TextBox5.Width = 1.575984! + ' + 'TextBox6 + ' + Me.TextBox6.Height = 0.1586614! + Me.TextBox6.Left = 0.0000002384186! + Me.TextBox6.Name = "TextBox6" + Me.TextBox6.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.TextBox6.Style = "font-size: 10pt; font-weight: bold; text-align: right; ddo-char-set: 1" + Me.TextBox6.Text = "Nr" + Me.TextBox6.Top = 0.00000007450581! + Me.TextBox6.Width = 0.3543307! + ' + 'TextBox7 + ' + Me.TextBox7.Height = 0.1586614! + Me.TextBox7.Left = 0.3543308! + Me.TextBox7.Name = "TextBox7" + Me.TextBox7.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox7.Text = "Kennzeichen" + Me.TextBox7.Top = 0.00000007450581! + Me.TextBox7.Width = 1.377953! + ' + 'TextBox11 + ' + Me.TextBox11.Height = 0.1586614! + Me.TextBox11.Left = 3.308268! + Me.TextBox11.Name = "TextBox11" + Me.TextBox11.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox11.Text = "OBUID" + Me.TextBox11.Top = 0.0! + Me.TextBox11.Width = 1.940551! + ' + 'GroupFooter1 + ' + Me.GroupFooter1.Height = 0.0! + Me.GroupFooter1.Name = "GroupFooter1" + ' + 'Line2 + ' + Me.Line2.Height = 0.0001809001! + Me.Line2.Left = 0.0! + Me.Line2.LineWeight = 1.0! + Me.Line2.Name = "Line2" + Me.Line2.Top = 0.1852522! + Me.Line2.Width = 6.496063! + Me.Line2.X1 = 0.0! + Me.Line2.X2 = 6.496063! + Me.Line2.Y1 = 0.1854331! + Me.Line2.Y2 = 0.1852522! + ' + 'subrptBriefSDL_cz + ' + Me.MasterReport = False + Me.PageSettings.Margins.Bottom = 0.0! + Me.PageSettings.Margins.Left = 0.0! + Me.PageSettings.Margins.Right = 0.0! + Me.PageSettings.Margins.Top = 0.0! + Me.PageSettings.PaperHeight = 11.0! + Me.PageSettings.PaperWidth = 8.5! + Me.PrintWidth = 6.496063! + Me.Sections.Add(Me.GroupHeader1) + Me.Sections.Add(Me.Detail) + Me.Sections.Add(Me.GroupFooter1) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" & + "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" & + "lic", "Heading2", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal")) + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + Private WithEvents GroupHeader1 As GrapeCity.ActiveReports.SectionReportModel.GroupHeader + Private WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter + Private WithEvents lblKartenNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblLKWKz As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblOBUId As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox5 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox6 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox7 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox11 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents Line2 As GrapeCity.ActiveReports.SectionReportModel.Line +End Class diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.resx b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.resx new file mode 100644 index 00000000..e8cbd0f3 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 0, 0 + + + 0, 0 + + \ No newline at end of file diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.vb new file mode 100644 index 00000000..b94f28d9 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_truckmaster.vb @@ -0,0 +1,45 @@ +Imports GrapeCity.ActiveReports +Imports GrapeCity.ActiveReports.Document + +Public Class subrptBriefSDL_PLOSE_truckmaster + Public sqlStr = "" + + + Sub New(sqlStr) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.sqlStr = sqlStr + End Sub + Private Sub subrptAuswertungUeberfaelligeBestellungen_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart + + Dim kundenSQL As New kundenSQL + Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "SDL") + + End Sub + + Dim dummycount As Integer = 0 + Private Sub Detail1_Format(sender As System.Object, e As System.EventArgs) Handles Detail.Format + + dummycount = dummycount + 1 + lblNr.Text = dummycount + lblLKWKz.Text = cSqlDb.checkNullStr(Fields.Item("KfzKennzeichen").Value) + ' lblBestellDat.Text = cSqlDb.checkNullDate(Fields.Item("Bestelldatum").Value).ToShortDateString + ' lblLieferDat.Text = cSqlDb.checkNullDate(Fields.Item("Lieferdatum").Value).ToShortDateString + lblOBUId.Text = cSqlDb.checkNullStr(Fields.Item("OBUID").Value) + lblKartenNr.Text = cSqlDb.checkNullStr(Fields.Item("KartenNr").Value) + + + 'Abwechselnd grauen und weißen Hintergrund + If (dummycount Mod 2) = 0 Then + Detail.BackColor = Color.White + Else + Detail.BackColor = Color.FromArgb(250, 250, 250) + End If + End Sub + + + +End Class diff --git a/SDL/Resources/plose_truckmaster.png b/SDL/Resources/plose_truckmaster.png new file mode 100644 index 0000000000000000000000000000000000000000..080b64df453db9af34579bd2d05b65f4f3b2f73b GIT binary patch literal 5488 zcmaJ_XIN9)whcX0K{^74jsl@~P&$O(rE5q6L`skZ2qIl6(xggn3ep6mizopp(n6J9 z1nEiG!ST* z7t#}hM0tRID?%Mn-WX->OQ-)y!QJy8Sr7Ez$8>pMqFAV>s5n^ccS?VN1_u8>)ZP6b zG#X=y_^;ppQy6XT=ZO$CMW9jMUa-r;Ir01s<*A_Vg@9sEUgjv2+n-Z3c0plKXcv?x zNZm{ZBzOnu0Y~|wZ~TQfFi?PapfOMn7y_c9%zdc4Si4d7<1v zf2FK|{C6+%|El*l7yj>FRR5JLdTB=VcVYimq5o`McF*tWKW%%t_^0s^9+%zj^}DU> zjiUenx+RE)syTKl*_sk-{xjwFfwZqfdU~^y+EpNg_md>?(Boio(L1!pCMFv`gHHt6*l(&QA*0|7_NMND;%?aD@sf3QT#lS} zNT2_WR~Ldw^N&_90uCpZZvHxSA!G}ORS9-csMC@2&P1KFEwMQa)OmSU3GDY;r=Ont zarSQWgi?&3?3&7aweOs*794Vbkc>@9`-K#_f}a-5F!UD@tiw|RSzq4_Cg z*T66zb@PqFwm#E)3&r0^*~jG75cdRU9mm@U|mxSYVJ{K{I9ud3Q0TWFEhD04PIs|RmGI6ABt+>Pg1AnkD?v)5%9|(kK z?~t&#`#6$7_&8g58Dqc2_txPSNc89G-z;rvEJ>XmyKLsc85lpW4?pPu>(<|7l~-|w zvz^ci6*phKhk8rdILwEm1vwI?$10MDJ+*(Gcg33(Go~#XIyOXn-&VO;**#DD6!Le^dY6nE!&y0Et#&KoCvO#kzWAv2P<}m&SpbLF2_>q;DN`mTh%{*OZqIdTg z#jHuRAl%EqKAAi(CqT9>Fr)Iyi(C!qx)%#c!P1eYS;0db`fHdqR|2C@{{4FHCz%n8 zg9}EgZ$^k;JV>~|_sTM#xrkR29N)?RDFRjYK{CTuX`t62fa)b0f^n| zi5Y##QeJ2es{gL0Id`RJf<)i`b7Z4oQ~As~uCGyC#O8;XB~1sw4TDf%dB50*k3Vc> zF#Z5YI4j`dEf5}qv!dma&2_m8tVXV1wLCKQG5~>@3A#U*xU&Qreabj-?*F)272c5Y z_E25m{f{QXh!QSt-*@XHsPrj4br2TpW8z{hs-)Y%U8A zjLGo9k9EswvI*>U7dVyH!-xB6tK)!79kwPV17VyU3>|2#$5DA)c63k@9Iu}=r>ipc zE2G>GRB2TshEsYmyxrD8b`A`*$T*VD*VVw8066_c~Ffh#wh2b%8) zSF#SFIDgsOc8o5!Q=aqP&JsQs8$0BpSCB|nJJSfC5bXDOWggctV+PTSBqSMn@XRoP zLbnTQ%mdRp(6HWISLQ$9U2T^ucFs__;&{%VP)+a7XC0Y+ZKV=Ig)DN>cc!9i=5AZt zZ>|_xniV;F6SPKARBEo7nZ{8pMVoWB%ivw7m6<<6mMa4mE`Gc4vboSXYid|YLzPrJ zo*C|WQZ#uqj<9fjU@EcwrK+vq$B%O}+O9Q;j~sb%7&dMVYYrrZ5y0RZ4?<2wah`Pe zDCrYWdh>ys#C|vVQ(!9odKb7NjPy*esOJ17cZY^_*0Yolw`;3WI`>P`bjKB65I;L6 z9iJ3RnuV;lRm6oVJ#g;I-RlTy-`dXW*Q`~p%jYLe6G6V9i}uFK`0C;%m+Xn zUS;drPg%FXmD-*S-7eU3Cd`g@FVojozk31ffD{f=>^c;{B7dO<(GD-F7 zlUZ{NTfU?-J=@+LO2Hp?&A&QWl8{$;W3*^r+;4l_sRhI4OgEu@>Jb7fVScJF_Z`AxmjDdLr(n*A_%bxPQ;@@T-5=(6z_Ydt3s35E1;OA(Z(h_d?i@VOn`@R zofRjZkj$WVBPaisl*?-)Kf;jG)i3EIXr+p^plP1_kt!Ta96wrSzg$deTn_Tj@V>`~!!)l`OwDyVXn8%h-E zawyzVUsQkM=Dcdv-N$WJe9t*r%A(Lao5J>Ws`5Rw$2I+8lZz6Xjgrj)_HS!z zjc-azH$qq?i-J@hHM$*{3JMAa!?fe?yx;998}RYYw#~VkNK5fpI&=2d*WD+3zQ$`V z5g%#z<9csn)<$mkRGUr*R%a{K%Ar>~6@ANXYK{#Cq#9Q9QGsRJCKm66A;s^A%PE+m zmpABSUIIcAyKnR+I;e4;EJ0s`y)!nNKeY3x;ORr!wt8TQTN_bdsW_-{8PvY27g#rw z+5B)v6UgHGiOAk{uh`@FSGFh50$EoMcDE|_#x6aIa67adt?+5vr-OCczdnODs7tZE zmiMatDaQ4Knh$ZSVS3Zu-Tif5XNj}uueC zsjj8Cq$H$a?$Nh=4#gb*nl~lO9VZP+JM{yyO@}i__=3`&`}1K}ZZ&EpYBXYhEZz=0 zY@Orzdj4Q`b#KIh}Qi_pRndd(j~q2WoAyz@cQ~fcF8{B8P2O zCK|rF(w|uds!Mg5kYZqD+$0ZI`*Mxr$vqIT-=JUU8To0}B-&`E<>I38aSD^o^o zdV|2QKKo|pHX>9IZ};KRBm$=q7Gqkv(TNsc%;yc1q2UX7Obhb68ajIGF}cU+3Ol7g zC}vfJPPDPc4kT3Cv3+pIrq8l!+Wo_EST26D0d?1&s;hZ;IB|t!nbQ2_iY)a{j6x=O z|7Ykk-PT&<2#7tdoHy>~`~3aS6?kx?Xa0573}b}ktT4VQQLr^y^gPwp#=`r@$;EEv z1$}HpvHd%rivw7E;KeK+ZC~|sAp*oeF?ltrojnn(c(KzJCipPmjEEV(kW=ZMs~997 z(OspI<7|N~7fUt9Wj-6`S!ZS|W*A$Tv|b@vjc`0jvnzr_>Nl%yUnSx6ziSl8MTNoK zfpVHMxow%GP4PiG=jI>hAR^dlx{4MS=vX*^dDLe};#T+SQ+tq#hg|rs#csN8QNC$j8-HlEF|^G5%>;^J$Ne=XOA5eSqnm=ifKBj>&Y92`b{o6K4Fe%Nau*|mJq2n zQvR%yN+69MxsIGJ~QMv3m zx#3zY7Cu;A{AlP$#Kro;;fy?bp+a$6%}Hl)Vi2Be9S3t?Z5n9px*kMjbbF8C`&^xK z=Hri=?(Y5HT*u0Xx2=N6ykB}}e^|a|Ti=kYRJc9gf;w4!t^FZjwUc@tLSC}_k~VBx z`S>I1y7I&FijtCU920qjI0@ddkjsM2R!!o@WI{y%l>C_IDpki)8K-j>$*xhXYG>O9 zI0wly@EEBn)2T}yvDez#nsT$APOnTTX#Z7%FaBceqiva{$zePRW$)K-vTgujX(63+ z{7oTO8_V}fJfY{b2yx$O`e|W34~JcXt_M3)uBg*TC%;~0zgG^}uMGNm>N`LCbM>`s za$jPPP>*l(9{%08L4jG8pVz-kP%$z_(?ko}2tF>MB7^p?DZJ|^n4MjX7&!2$Ddn$u z%5QCBlkxrJ)-j6}U26sI2%|+BA8=krO}=zt9A>gWtveETNJ7$RMeH^q7ef|mJ-ga; zCz14SYT?I-i(^*eP}NVpd$?2)+dQ{l!q}fFcP?^fUep!-{88Fd7*81rNN^$M4A}Q? zsGP4l?+E`Gd*NTOX;qlg5b?&YJNLTl@~7jI>y1GM5XhU;+?LZy?VWGbAJusV&Q^}* zZzbs#+U1QHo0**uZAZo{qmTO(*bXi{w@;jbD3N9kQ@I4?-A}%d_bA>F+f@T)T>F{*YDWzY>$UvOe)b54;4^cw>2mk;8 literal 0 HcmV?d00001 diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 69090272..bb3059d7 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -751,6 +751,12 @@ Component + + usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb + + + UserControl + usrCntlSDLLeistungenPLOSE_MEDPASS.vb @@ -768,6 +774,12 @@ True Resources.resx + + subrptBriefSDL_PLOSE_truckmaster.vb + + + Component + subrptBriefSDL_VERAGCARD.vb @@ -3138,6 +3150,9 @@ rptASFINAG_TransaktionenSumary.vb + + usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb + usrCntlSDLLeistungenPLOSE_MEDPASS.vb @@ -3145,6 +3160,9 @@ usrCntlSDLLeistungVERAGCardNEU.vb + + subrptBriefSDL_PLOSE_truckmaster.vb + subrptBriefSDL_VERAGCARD.vb @@ -4655,6 +4673,7 @@ + Always diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index a91b32bd..fff6fa99 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -1210,7 +1210,7 @@ Public Class frmKundenblatt Case 212 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr 'UTA Case 101 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.WölflKundenNr 'WÖLFL Case 202 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.TELEPASS_Kd_Nr 'TELEPASS - Case 214, 215, 216, 217 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr 'PLOSE + Case 214, 215, 216, 217, 218 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr 'PLOSE Case 201 : grpMautDE.Visible = True : Panel2.Visible = False 'MAUT DE txtMautDE_FlottenPIN.Text = PartnerKdNrFromFMZOLL.MautDE_FlottenPIN 'MAUT DE @@ -1229,7 +1229,7 @@ Public Class frmKundenblatt Case 203 : scanErstbestellung.Visible = True Case 209 : scanErstbestellung.Visible = True Case 215 : scanErstbestellung.Visible = True' PLOSE IT - Case 214, 217 : scanErstbestellung.Visible = True 'PLOSE Roadmaster + Case 214, 217, 218 : scanErstbestellung.Visible = True 'PLOSE Roadmaster Case 211 ' scanErstbestellung.Visible = True scanMWSTAgreement.Visible = True @@ -1255,7 +1255,7 @@ Public Class frmKundenblatt 'gibt keine Einträge Case 202 : kundenSQL.setPartnerKdNrFromFMZOLL("TELEPASS-Kd-Nr", txtPartnerKdNr.Text, kdNr) 'TELEPASS kundenSQL.setPartnerKdNrSDL("TELEPASS-Kd-Nr", txtPartnerKdNr.Text, kdNr, sdlNrTmp) - Case 214, 215, 216, 217 : kundenSQL.setPartnerKdNrFromFMZOLL("PLOSEKundenNr", txtPartnerKdNr.Text, kdNr) 'PLOSE + Case 214, 215, 216, 217, 218 : kundenSQL.setPartnerKdNrFromFMZOLL("PLOSEKundenNr", txtPartnerKdNr.Text, kdNr) 'PLOSE Case 201 : kundenSQL.setPartnerKdNrFromFMZOLL_DE(kdNr, txtMautDE_FlottenPIN.Text, txtMautDEMasterPIN.Text, txtMautDE_BenutzerNr.Text) kundenSQL.setPartnerKdNrSDL("FlottenPIN", txtMautDE_FlottenPIN.Text, kdNr, sdlNrTmp) kundenSQL.setPartnerKdNrSDL("MasterPIN", txtMautDEMasterPIN.Text, kdNr, sdlNrTmp) diff --git a/SDL/kunden/usrCntlLKW.vb b/SDL/kunden/usrCntlLKW.vb index f7579284..3b099f28 100644 --- a/SDL/kunden/usrCntlLKW.vb +++ b/SDL/kunden/usrCntlLKW.vb @@ -441,7 +441,7 @@ Public Class usrCntlLKW End Sub - ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 217 Then ' PLOSE CZ + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 217 Then ' PLOSE MED Dim usrcntl As New usrCntlSDLLeistungenPLOSE_MEDPASS(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) pnlSDLLeistungenDetails.Controls.Add(usrcntl) AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) @@ -452,6 +452,17 @@ Public Class usrCntlLKW End Sub + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 218 Then ' PLOSE TRUCKMASTER + Dim usrcntl As New usrCntlSDLLeistungenPLOSE_TRUCKMASTER(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) + pnlSDLLeistungenDetails.Controls.Add(usrcntl) + AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) + RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History) + End Sub + AddHandler usrcntl.CHANGED, Sub(kdNr, newKfz, SDLNr, History) + doChange(kdNr, newKfz, SDLNr, History) + End Sub + + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 500 Then ' MAN Dim usrcntl As New usrCntlSDLLeistungenMANAbgas(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) pnlSDLLeistungenDetails.Controls.Add(usrcntl) diff --git a/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb b/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb index 2cec236b..af6390af 100644 --- a/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb +++ b/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb @@ -243,6 +243,7 @@ Public Class frmSDLAbholungEintrag " WHEN '215' THEN 'IT' " & " WHEN '216' THEN 'CZ' " & " WHEN '217' THEN 'MED PASS' " & + " WHEN '218' THEN 'TRUCK MASTER' " & " WHEN '203' THEN 'CZ' " & " WHEN '209' THEN 'PL' " & " WHEN '500' THEN 'ABGASPLAKETTE' " & @@ -264,6 +265,7 @@ Public Class frmSDLAbholungEintrag " WHEN '215' THEN cast([TELEPASS-Nr] as VARCHAR(200)) " & " WHEN '216' THEN cast(KartenNr as VARCHAR(200)) " & " WHEN '217' THEN cast(OBUID as VARCHAR(200)) " & + " WHEN '218' THEN cast(OBUID as VARCHAR(200)) " & " WHEN '203' THEN cast(KartenNr as VARCHAR(200)) " & " WHEN '209' THEN cast(KartenNr/*[MSE-Kd-Nr]*/ as VARCHAR(200)) " & " WHEN '500' THEN '-' " & @@ -275,7 +277,7 @@ Public Class frmSDLAbholungEintrag " FROM [SDL] " & " WHERE KundenNr = " & KdFirma.KdNr_value If sdlnr > 0 Then : sqlStr &= " AND SDLNr=" & sdlnr - Else : sqlStr &= " AND SDLNr IN (100,101,202,207,208,210,211,212,213,214,215,216,217,500,501,502)" + Else : sqlStr &= " AND SDLNr IN (100,101,202,207,208,210,211,212,213,214,215,216,217,218,500,501,502)" End If sqlStr &= " AND Lieferdatum between '" & datVon.Value.ToShortDateString & "' and '" & datBis.Value.ToShortDateString & "' " diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.Designer.vb new file mode 100644 index 00000000..70e48345 --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.Designer.vb @@ -0,0 +1,650 @@ + +Partial Class usrCntlSDLLeistungenPLOSE_TRUCKMASTER + 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.cbxRetourniert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.txtPin = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtKartenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtOBUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.txtPLOSEKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Label8 = New System.Windows.Forms.Label() + Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.cbxGestohlen = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxVerloren = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxGesperrt = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxDefekt = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.txtLieferung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBestellung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGueltigkeit2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.tbcntr = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrCntlDetails = New SDL.usrCntlAllg() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.scanBestellung = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() + Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() + Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() + Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.scanRetourniert = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() + Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.Panel2.SuspendLayout() + Me.tbcntr.SuspendLayout() + Me.TabPage1.SuspendLayout() + Me.TabPage2.SuspendLayout() + Me.SuspendLayout() + ' + 'cbxRetourniert + ' + Me.cbxRetourniert._date = Nothing + Me.cbxRetourniert._showdate = True + Me.cbxRetourniert._value = "" + Me.cbxRetourniert.AutoSize = True + Me.cbxRetourniert.Location = New System.Drawing.Point(333, 64) + Me.cbxRetourniert.Name = "cbxRetourniert" + Me.cbxRetourniert.Size = New System.Drawing.Size(78, 17) + Me.cbxRetourniert.TabIndex = 7 + Me.cbxRetourniert.Text = "Retourniert" + Me.cbxRetourniert.UseVisualStyleBackColor = True + ' + 'txtPin + ' + Me.txtPin._DateTimeOnly = False + Me.txtPin._numbersOnly = False + Me.txtPin._numbersOnlyKommastellen = "" + Me.txtPin._numbersOnlyTrennzeichen = True + Me.txtPin._Prozent = False + Me.txtPin._ShortDateNew = False + Me.txtPin._ShortDateOnly = False + Me.txtPin._TimeOnly = False + Me.txtPin._TimeOnly_Seconds = False + Me.txtPin._value = Nothing + Me.txtPin._Waehrung = False + Me.txtPin._WaehrungZeichen = True + Me.txtPin.ForeColor = System.Drawing.Color.Black + Me.txtPin.Location = New System.Drawing.Point(106, 118) + Me.txtPin.MaxLength = 9 + Me.txtPin.MaxLineLength = -1 + Me.txtPin.MaxLines_Warning = "" + Me.txtPin.MaxLines_Warning_Label = Nothing + Me.txtPin.Name = "txtPin" + Me.txtPin.Size = New System.Drawing.Size(74, 20) + Me.txtPin.TabIndex = 3 + ' + 'txtKartenNr + ' + Me.txtKartenNr._DateTimeOnly = False + Me.txtKartenNr._numbersOnly = False + Me.txtKartenNr._numbersOnlyKommastellen = "" + Me.txtKartenNr._numbersOnlyTrennzeichen = True + Me.txtKartenNr._Prozent = False + Me.txtKartenNr._ShortDateNew = False + Me.txtKartenNr._ShortDateOnly = False + Me.txtKartenNr._TimeOnly = False + Me.txtKartenNr._TimeOnly_Seconds = False + Me.txtKartenNr._value = Nothing + Me.txtKartenNr._Waehrung = False + Me.txtKartenNr._WaehrungZeichen = True + Me.txtKartenNr.ForeColor = System.Drawing.Color.Black + Me.txtKartenNr.Location = New System.Drawing.Point(196, 181) + Me.txtKartenNr.MaxLength = 22 + Me.txtKartenNr.MaxLineLength = -1 + Me.txtKartenNr.MaxLines_Warning = "" + Me.txtKartenNr.MaxLines_Warning_Label = Nothing + Me.txtKartenNr.Name = "txtKartenNr" + Me.txtKartenNr.Size = New System.Drawing.Size(93, 20) + Me.txtKartenNr.TabIndex = 2 + Me.txtKartenNr.Visible = False + ' + 'txtOBUID + ' + Me.txtOBUID._DateTimeOnly = False + Me.txtOBUID._numbersOnly = False + Me.txtOBUID._numbersOnlyKommastellen = "" + Me.txtOBUID._numbersOnlyTrennzeichen = True + Me.txtOBUID._Prozent = False + Me.txtOBUID._ShortDateNew = False + Me.txtOBUID._ShortDateOnly = False + Me.txtOBUID._TimeOnly = False + Me.txtOBUID._TimeOnly_Seconds = False + Me.txtOBUID._value = Nothing + Me.txtOBUID._Waehrung = False + Me.txtOBUID._WaehrungZeichen = True + Me.txtOBUID.ForeColor = System.Drawing.Color.Black + Me.txtOBUID.Location = New System.Drawing.Point(106, 96) + Me.txtOBUID.MaxLength = 18 + Me.txtOBUID.MaxLineLength = -1 + Me.txtOBUID.MaxLines_Warning = "" + Me.txtOBUID.MaxLines_Warning_Label = Nothing + Me.txtOBUID.Name = "txtOBUID" + Me.txtOBUID.Size = New System.Drawing.Size(183, 20) + Me.txtOBUID.TabIndex = 4 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(3, 121) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(29, 13) + Me.Label3.TabIndex = 14 + Me.Label3.Text = "Pin:" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(121, 184) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(69, 13) + Me.Label1.TabIndex = 9 + Me.Label1.Text = "Karten-Nr.:" + Me.Label1.Visible = False + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(3, 99) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(52, 13) + Me.Label9.TabIndex = 12 + Me.Label9.Text = "OBU-Id:" + ' + 'txtPLOSEKdNr + ' + Me.txtPLOSEKdNr._DateTimeOnly = False + Me.txtPLOSEKdNr._numbersOnly = True + Me.txtPLOSEKdNr._numbersOnlyKommastellen = "" + Me.txtPLOSEKdNr._numbersOnlyTrennzeichen = True + Me.txtPLOSEKdNr._Prozent = False + Me.txtPLOSEKdNr._ShortDateNew = False + Me.txtPLOSEKdNr._ShortDateOnly = False + Me.txtPLOSEKdNr._TimeOnly = False + Me.txtPLOSEKdNr._TimeOnly_Seconds = False + Me.txtPLOSEKdNr._value = "" + Me.txtPLOSEKdNr._Waehrung = False + Me.txtPLOSEKdNr._WaehrungZeichen = True + Me.txtPLOSEKdNr.Location = New System.Drawing.Point(574, 6) + Me.txtPLOSEKdNr.MaxLineLength = -1 + Me.txtPLOSEKdNr.MaxLines_Warning = "" + Me.txtPLOSEKdNr.MaxLines_Warning_Label = Nothing + Me.txtPLOSEKdNr.Name = "txtPLOSEKdNr" + Me.txtPLOSEKdNr.Size = New System.Drawing.Size(183, 20) + Me.txtPLOSEKdNr.TabIndex = 21 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.ForeColor = System.Drawing.Color.White + Me.Label2.Location = New System.Drawing.Point(471, 9) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(93, 13) + Me.Label2.TabIndex = 20 + Me.Label2.Text = "Plose-Kunden-Nr.:" + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel2.Controls.Add(Me.Label8) + Me.Panel2.Controls.Add(Me.txtPLOSEKdNr) + Me.Panel2.Controls.Add(Me.Label2) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(760, 30) + Me.Panel2.TabIndex = 94 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.ForeColor = System.Drawing.Color.White + Me.Label8.Location = New System.Drawing.Point(6, 9) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(148, 13) + Me.Label8.TabIndex = 14 + Me.Label8.Text = "PLOSE TRUCK MASTER" + ' + 'txtVermerk + ' + Me.txtVermerk._DateTimeOnly = False + Me.txtVermerk._numbersOnly = False + Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._numbersOnlyTrennzeichen = True + Me.txtVermerk._Prozent = False + Me.txtVermerk._ShortDateNew = False + Me.txtVermerk._ShortDateOnly = False + Me.txtVermerk._TimeOnly = False + Me.txtVermerk._TimeOnly_Seconds = False + Me.txtVermerk._value = Nothing + Me.txtVermerk._Waehrung = False + Me.txtVermerk._WaehrungZeichen = True + Me.txtVermerk.Location = New System.Drawing.Point(106, 162) + Me.txtVermerk.MaxLength = 100 + Me.txtVermerk.MaxLineLength = -1 + Me.txtVermerk.MaxLines_Warning = "" + Me.txtVermerk.MaxLines_Warning_Label = Nothing + Me.txtVermerk.Multiline = True + Me.txtVermerk.Name = "txtVermerk" + Me.txtVermerk.Size = New System.Drawing.Size(183, 55) + Me.txtVermerk.TabIndex = 5 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(3, 165) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(49, 13) + Me.Label4.TabIndex = 119 + Me.Label4.Text = "Vermerk:" + ' + 'cbxGestohlen + ' + Me.cbxGestohlen._date = Nothing + Me.cbxGestohlen._showdate = True + Me.cbxGestohlen._value = "" + Me.cbxGestohlen.AutoSize = True + Me.cbxGestohlen.Location = New System.Drawing.Point(333, 134) + Me.cbxGestohlen.Name = "cbxGestohlen" + Me.cbxGestohlen.Size = New System.Drawing.Size(74, 17) + Me.cbxGestohlen.TabIndex = 9 + Me.cbxGestohlen.Text = "Gestohlen" + Me.cbxGestohlen.UseVisualStyleBackColor = True + ' + 'cbxVerloren + ' + Me.cbxVerloren._date = Nothing + Me.cbxVerloren._showdate = True + Me.cbxVerloren._value = "" + Me.cbxVerloren.AutoSize = True + Me.cbxVerloren.Location = New System.Drawing.Point(333, 111) + Me.cbxVerloren.Name = "cbxVerloren" + Me.cbxVerloren.Size = New System.Drawing.Size(65, 17) + Me.cbxVerloren.TabIndex = 8 + Me.cbxVerloren.Text = "Verloren" + Me.cbxVerloren.UseVisualStyleBackColor = True + ' + 'cbxGesperrt + ' + Me.cbxGesperrt._date = Nothing + Me.cbxGesperrt._showdate = True + Me.cbxGesperrt._value = "" + Me.cbxGesperrt.AutoSize = True + Me.cbxGesperrt.Location = New System.Drawing.Point(333, 155) + Me.cbxGesperrt.Name = "cbxGesperrt" + Me.cbxGesperrt.Size = New System.Drawing.Size(66, 17) + Me.cbxGesperrt.TabIndex = 10 + Me.cbxGesperrt.Text = "Gesperrt" + Me.cbxGesperrt.UseVisualStyleBackColor = True + ' + 'cbxDefekt + ' + Me.cbxDefekt._date = Nothing + Me.cbxDefekt._showdate = True + Me.cbxDefekt._value = "" + Me.cbxDefekt.AutoSize = True + Me.cbxDefekt.Location = New System.Drawing.Point(333, 177) + Me.cbxDefekt.Name = "cbxDefekt" + Me.cbxDefekt.Size = New System.Drawing.Size(58, 17) + Me.cbxDefekt.TabIndex = 11 + Me.cbxDefekt.Text = "Defekt" + Me.cbxDefekt.UseVisualStyleBackColor = True + ' + 'txtLieferung + ' + Me.txtLieferung._DateTimeOnly = False + Me.txtLieferung._numbersOnly = False + Me.txtLieferung._numbersOnlyKommastellen = "" + Me.txtLieferung._numbersOnlyTrennzeichen = True + Me.txtLieferung._Prozent = False + Me.txtLieferung._ShortDateNew = True + Me.txtLieferung._ShortDateOnly = False + Me.txtLieferung._TimeOnly = False + Me.txtLieferung._TimeOnly_Seconds = False + Me.txtLieferung._value = "" + Me.txtLieferung._Waehrung = False + Me.txtLieferung._WaehrungZeichen = True + Me.txtLieferung.ForeColor = System.Drawing.Color.Red + Me.txtLieferung.Location = New System.Drawing.Point(106, 62) + Me.txtLieferung.MaxLength = 10 + Me.txtLieferung.MaxLineLength = -1 + Me.txtLieferung.MaxLines_Warning = "" + Me.txtLieferung.MaxLines_Warning_Label = Nothing + Me.txtLieferung.Name = "txtLieferung" + Me.txtLieferung.Size = New System.Drawing.Size(74, 20) + Me.txtLieferung.TabIndex = 1 + ' + 'txtBestellung + ' + Me.txtBestellung._DateTimeOnly = False + Me.txtBestellung._numbersOnly = False + Me.txtBestellung._numbersOnlyKommastellen = "" + Me.txtBestellung._numbersOnlyTrennzeichen = True + Me.txtBestellung._Prozent = False + Me.txtBestellung._ShortDateNew = True + Me.txtBestellung._ShortDateOnly = False + Me.txtBestellung._TimeOnly = False + Me.txtBestellung._TimeOnly_Seconds = False + Me.txtBestellung._value = "" + Me.txtBestellung._Waehrung = False + Me.txtBestellung._WaehrungZeichen = True + Me.txtBestellung.ForeColor = System.Drawing.Color.Red + Me.txtBestellung.Location = New System.Drawing.Point(106, 36) + Me.txtBestellung.MaxLength = 10 + Me.txtBestellung.MaxLineLength = -1 + Me.txtBestellung.MaxLines_Warning = "" + Me.txtBestellung.MaxLines_Warning_Label = Nothing + Me.txtBestellung.Name = "txtBestellung" + Me.txtBestellung.Size = New System.Drawing.Size(74, 20) + Me.txtBestellung.TabIndex = 0 + ' + 'txtGueltigkeit2 + ' + Me.txtGueltigkeit2._DateTimeOnly = False + Me.txtGueltigkeit2._numbersOnly = False + Me.txtGueltigkeit2._numbersOnlyKommastellen = "" + Me.txtGueltigkeit2._numbersOnlyTrennzeichen = True + Me.txtGueltigkeit2._Prozent = False + Me.txtGueltigkeit2._ShortDateNew = True + Me.txtGueltigkeit2._ShortDateOnly = False + Me.txtGueltigkeit2._TimeOnly = False + Me.txtGueltigkeit2._TimeOnly_Seconds = False + Me.txtGueltigkeit2._value = "" + Me.txtGueltigkeit2._Waehrung = False + Me.txtGueltigkeit2._WaehrungZeichen = True + Me.txtGueltigkeit2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtGueltigkeit2.ForeColor = System.Drawing.Color.Red + Me.txtGueltigkeit2.Location = New System.Drawing.Point(389, 36) + Me.txtGueltigkeit2.MaxLength = 10 + Me.txtGueltigkeit2.MaxLineLength = -1 + Me.txtGueltigkeit2.MaxLines_Warning = "" + Me.txtGueltigkeit2.MaxLines_Warning_Label = Nothing + Me.txtGueltigkeit2.Name = "txtGueltigkeit2" + Me.txtGueltigkeit2.Size = New System.Drawing.Size(74, 20) + Me.txtGueltigkeit2.TabIndex = 6 + Me.txtGueltigkeit2.Visible = False + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(3, 65) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(65, 13) + Me.Label6.TabIndex = 123 + Me.Label6.Text = "Lieferdatum:" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(3, 39) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(70, 13) + Me.Label7.TabIndex = 122 + Me.Label7.Text = "Bestelldatum:" + ' + 'Label11 + ' + Me.Label11.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(330, 39) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(53, 13) + Me.Label11.TabIndex = 121 + Me.Label11.Text = "Gültig bis:" + Me.Label11.Visible = False + ' + 'tbcntr + ' + Me.tbcntr.Controls.Add(Me.TabPage1) + Me.tbcntr.Controls.Add(Me.TabPage2) + Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Right + Me.tbcntr.Location = New System.Drawing.Point(496, 30) + Me.tbcntr.Name = "tbcntr" + Me.tbcntr.SelectedIndex = 0 + Me.tbcntr.Size = New System.Drawing.Size(264, 190) + Me.tbcntr.TabIndex = 127 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.UsrCntlDetails) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(256, 164) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Details" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'UsrCntlDetails + ' + Me.UsrCntlDetails.BackColor = System.Drawing.Color.White + Me.UsrCntlDetails.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlDetails.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlDetails.Name = "UsrCntlDetails" + Me.UsrCntlDetails.Size = New System.Drawing.Size(250, 158) + Me.UsrCntlDetails.TabIndex = 18 + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.scanBestellung) + Me.TabPage2.Controls.Add(Me.scanPIN) + Me.TabPage2.Controls.Add(Me.scanLieferschein) + Me.TabPage2.Controls.Add(Me.scanSonstiges) + Me.TabPage2.Controls.Add(Me.scanRetourniert) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(256, 164) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Dokumente" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'scanBestellung + ' + Me.scanBestellung._ARCHIV = True + Me.scanBestellung._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanBestellung._DATENSERVER_ORDNER = "MDM" + Me.scanBestellung._DATENSERVER_UOrdner1 = Nothing + Me.scanBestellung._DATENSERVER_UOrdner2 = Nothing + Me.scanBestellung._DATENSERVER_UOrdner3 = Nothing + Me.scanBestellung._MULTI_FILES = True + Me.scanBestellung._TEXT_PDF = "Bestellung" + Me.scanBestellung.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanBestellung.BackColor = System.Drawing.Color.White + Me.scanBestellung.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanBestellung.Cursor = System.Windows.Forms.Cursors.Default + Me.scanBestellung.Location = New System.Drawing.Point(3, 30) + Me.scanBestellung.Name = "scanBestellung" + Me.scanBestellung.Size = New System.Drawing.Size(94, 24) + Me.scanBestellung.TabIndex = 26 + ' + 'scanPIN + ' + Me.scanPIN._ARCHIV = True + Me.scanPIN._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanPIN._DATENSERVER_ORDNER = "MDM" + Me.scanPIN._DATENSERVER_UOrdner1 = Nothing + Me.scanPIN._DATENSERVER_UOrdner2 = Nothing + Me.scanPIN._DATENSERVER_UOrdner3 = Nothing + Me.scanPIN._MULTI_FILES = True + Me.scanPIN._TEXT_PDF = "PIN" + Me.scanPIN.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanPIN.BackColor = System.Drawing.Color.White + Me.scanPIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanPIN.Cursor = System.Windows.Forms.Cursors.Default + Me.scanPIN.Location = New System.Drawing.Point(192, 4) + Me.scanPIN.Name = "scanPIN" + Me.scanPIN.Size = New System.Drawing.Size(58, 24) + Me.scanPIN.TabIndex = 24 + ' + 'scanLieferschein + ' + Me.scanLieferschein._ARCHIV = True + Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanLieferschein._DATENSERVER_ORDNER = "MDM" + Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing + Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing + Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing + Me.scanLieferschein._MULTI_FILES = True + Me.scanLieferschein._TEXT_PDF = "Lieferschein" + Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanLieferschein.BackColor = System.Drawing.Color.White + Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default + Me.scanLieferschein.Location = New System.Drawing.Point(3, 4) + Me.scanLieferschein.Name = "scanLieferschein" + Me.scanLieferschein.Size = New System.Drawing.Size(94, 24) + Me.scanLieferschein.TabIndex = 23 + ' + 'scanSonstiges + ' + Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanSonstiges._DATENSERVER_ORDNER = "MDM" + Me.scanSonstiges._DATENSERVER_UOrdner1 = "" + Me.scanSonstiges._DATENSERVER_UOrdner2 = "" + Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges._OPEN_ORIGINAL = False + Me.scanSonstiges._TYPE = "PDF" + Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanSonstiges.BackColor = System.Drawing.Color.White + Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanSonstiges.Location = New System.Drawing.Point(3, 56) + Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) + Me.scanSonstiges.Name = "scanSonstiges" + Me.scanSonstiges.Size = New System.Drawing.Size(250, 108) + Me.scanSonstiges.TabIndex = 21 + ' + 'scanRetourniert + ' + Me.scanRetourniert._ARCHIV = True + Me.scanRetourniert._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanRetourniert._DATENSERVER_ORDNER = "MDM" + Me.scanRetourniert._DATENSERVER_UOrdner1 = Nothing + Me.scanRetourniert._DATENSERVER_UOrdner2 = Nothing + Me.scanRetourniert._DATENSERVER_UOrdner3 = Nothing + Me.scanRetourniert._MULTI_FILES = True + Me.scanRetourniert._TEXT_PDF = "Retourniert" + Me.scanRetourniert.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanRetourniert.BackColor = System.Drawing.Color.White + Me.scanRetourniert.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanRetourniert.Cursor = System.Windows.Forms.Cursors.Default + Me.scanRetourniert.Location = New System.Drawing.Point(98, 4) + Me.scanRetourniert.Name = "scanRetourniert" + Me.scanRetourniert.Size = New System.Drawing.Size(93, 24) + Me.scanRetourniert.TabIndex = 20 + ' + 'cbxArchiviert + ' + Me.cbxArchiviert._date = Nothing + Me.cbxArchiviert._showdate = True + Me.cbxArchiviert._value = "" + Me.cbxArchiviert.AutoSize = True + Me.cbxArchiviert.Location = New System.Drawing.Point(333, 200) + Me.cbxArchiviert.Name = "cbxArchiviert" + Me.cbxArchiviert.Size = New System.Drawing.Size(91, 17) + Me.cbxArchiviert.TabIndex = 128 + Me.cbxArchiviert.Text = "ARCHIVIERT" + Me.cbxArchiviert.UseVisualStyleBackColor = True + ' + 'usrCntlSDLLeistungenPLOSE_TRUCKMASTER + ' + 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.cbxArchiviert) + Me.Controls.Add(Me.tbcntr) + Me.Controls.Add(Me.txtLieferung) + Me.Controls.Add(Me.txtBestellung) + Me.Controls.Add(Me.txtGueltigkeit2) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.Label11) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.cbxGestohlen) + Me.Controls.Add(Me.cbxVerloren) + Me.Controls.Add(Me.cbxGesperrt) + Me.Controls.Add(Me.cbxDefekt) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.cbxRetourniert) + Me.Controls.Add(Me.txtPin) + Me.Controls.Add(Me.txtKartenNr) + Me.Controls.Add(Me.txtOBUID) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.Label9) + Me.Controls.Add(Me.txtVermerk) + Me.Name = "usrCntlSDLLeistungenPLOSE_TRUCKMASTER" + Me.Size = New System.Drawing.Size(760, 220) + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() + Me.tbcntr.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage2.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents cbxRetourniert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents txtPin As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtKartenNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtOBUID As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents txtPLOSEKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents Panel2 As System.Windows.Forms.Panel + Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents cbxGestohlen As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxVerloren As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxGesperrt As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxDefekt As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents txtLieferung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtBestellung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtGueltigkeit2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents Label11 As System.Windows.Forms.Label + Friend WithEvents tbcntr As System.Windows.Forms.TabControl + Friend WithEvents TabPage1 As System.Windows.Forms.TabPage + Friend WithEvents UsrCntlDetails As SDL.usrCntlAllg + Friend WithEvents TabPage2 As System.Windows.Forms.TabPage + Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents scanRetourniert As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan + Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan + Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents scanPIN As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan + Friend WithEvents scanBestellung As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan +End Class diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.resx b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb new file mode 100644 index 00000000..83dc3f1a --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenPLOSE_TRUCKMASTER.vb @@ -0,0 +1,209 @@ + +Imports System.Globalization + +Public Class usrCntlSDLLeistungenPLOSE_TRUCKMASTER + Public KfzKennzeichen As String + Public SDLNr As String + Public kdNr As String + Dim PROG As New cProgramFunctions + Dim kundenSQL As New kundenSQL + Public History As String + + Dim culture As CultureInfo = New CultureInfo("de-DE") + Private PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll + Public addnew As Boolean = False + Dim VAL As New cValidationSDLLeistungen + Public Event LKWChanged(kdNr, newKfz, SDLNr, History) + Public Event CHANGED(kdNr, newKfz, SDLNr, History) + 'Public WithEvents s As New cBinding 'fürs Binding + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL + Dim boud = False + + + Sub New(kdNr, KfzKennzeichen, SDLNr, History) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + Me.kdNr = kdNr + Me.KfzKennzeichen = KfzKennzeichen + Me.SDLNr = SDLNr + Me.History = History + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Private Sub usrCntlLKW_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed + 'MsgBox("disp") + End Sub + + Private Sub usrCntlSDLLeistungenCZ_Load(sender As Object, e As EventArgs) Handles Me.Load + + UsrCntlDetails.kdNr = kdNr + UsrCntlDetails.SDLNr = SDLNr + UsrCntlDetails.History = History + UsrCntlDetails.lblLKWNr.Text = KfzKennzeichen + AddHandler UsrCntlDetails.LKWChanged, Sub(newKfz) + RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History) + End Sub + + 'Scan-Elemente initialisieren: + scanLieferschein.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + scanRetourniert.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + scanBestellung.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + scanPIN.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + + initDataBinding() + If txtPLOSEKdNr.Text = "" Then + getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr + txtPLOSEKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr + End If + + boud = True + + ' If txtMSEKdNr.Text = "" Then + ' getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr + ' txtMSEKdNr.Text = PartnerKdNrFromFMZOLL.MSEKundenNr + ' End If + + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then + cProgramFunctions.setControlReadOnly(Me) + End If + End Sub + Sub getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr + PartnerKdNrFromFMZOLL = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr) + End Sub + + + Function gueltigBisabgelaufen(o) As Boolean + If CDate(o) > Now Then + Return False + End If + Return True + End Function + + Sub initDataBinding() + Try + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) + + PROG.initDTPE(txtLieferung) + PROG.initDTPE(txtBestellung) + 'PROG.initDTPE(txtGueltigkeit2) + + txtLieferung._value = SDL.Lieferdatum + txtBestellung._value = SDL.Bestelldatum + ' txtGueltigkeit2._value = SDL.GültigBis + + cbxRetourniert._date = SDL.RetourniertAm + cbxVerloren._date = SDL.VerlorenAm + cbxGestohlen._date = SDL.GestohlenAm + cbxGesperrt._date = SDL.GesperrtAm + cbxDefekt._date = SDL.DefektAm + + cbxGesperrt.Checked = SDL.Gesperrt + cbxDefekt.Checked = SDL.Defekt + cbxGestohlen.Checked = SDL.Gestohlen + cbxVerloren.Checked = SDL.Verloren + cbxArchiviert.Checked = SDL.Archiviert + + cbxRetourniert.Checked = SDL.Retourniert + + txtVermerk.Text = SDL.Vermerk + + UsrCntlDetails.lblErfassung.Text = SDL.Erfassungsdatum + UsrCntlDetails.lblAenderung.Text = SDL.Änderungsdatum + UsrCntlDetails.lblSachbearb.Text = SDL.Sachbearbeiter + + ' txtPLOSEKdNr.Text = SDL.MSE_Kd_Nr + txtOBUID.Text = SDL.OBUID + txtKartenNr.Text = SDL.KartenNr + txtPin.Text = SDL.PIN + PROG.initPIN(txtPin) + + Catch ex As Exception + MsgBox(ex.Message) + MsgBox(ex.StackTrace) + End Try + + End Sub + + + Public Sub newEntry() + ' s.updateBinding() + ' s.newEntry(kdNr, KfzKennzeichen, SDLNr) 'NEUER EINTRAG! + If txtBestellung.Text = "" Then txtBestellung.Text = Now.ToShortDateString + End Sub + + Sub BindingTableColumnChanged() + UsrCntlDetails.lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UsrCntlDetails.lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") + ' If e.Column.ColumnName = "Sachbearbeiter" Or e.Column.ColumnName = "Änderungsdatum" Then Exit Sub + If save() Then RaiseEvent CHANGED(kdNr, KfzKennzeichen, SDLNr, History) + End Sub + + Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) + Dim valid As Boolean = VAL.checkValidDate(sender, True) + End Sub + + Public Function save() As Boolean + loadDataInClass() + Return SDL.SAVE + 'If checkSave() Then + ' Return kundenSQL.doSQLByList(s.bindingSource) + 'End If + Return False + End Function + + Sub loadDataInClass() + SDL.Lieferdatum = PROG.isEmptyNull(txtLieferung._value) + SDL.Bestelldatum = PROG.isEmptyNull(txtBestellung._value) + ' SDL.GültigBis = PROG.isEmptyNull(txtGueltigkeit2._value) + SDL.Gesperrt = cbxGesperrt.Checked + SDL.Defekt = cbxDefekt.Checked + SDL.Gestohlen = cbxGestohlen.Checked + SDL.Verloren = cbxVerloren.Checked + SDL.Retourniert = cbxRetourniert.Checked + SDL.Vermerk = txtVermerk.Text + SDL.Erfassungsdatum = UsrCntlDetails.lblErfassung.Text + SDL.Änderungsdatum = UsrCntlDetails.lblAenderung.Text + SDL.Sachbearbeiter = UsrCntlDetails.lblSachbearb.Text + 'SDL. = txtPLOSEKdNr.Text + SDL.OBUID = txtOBUID.Text + SDL.KartenNr = txtKartenNr.Text + SDL.PIN = txtPin.Text + + SDL.RetourniertAm = cbxRetourniert._date + SDL.VerlorenAm = cbxVerloren._date + SDL.GestohlenAm = cbxGestohlen._date + SDL.GesperrtAm = cbxGesperrt._date + SDL.DefektAm = cbxDefekt._date + SDL.Archiviert = cbxArchiviert.Checked + End Sub + + Function checkSave() As Boolean + ' If Not VAL.checkValidDate(txtBestellung, True) Then Return False 'cProgramFunctions.setInfo(Me.FindForm, "ERR", "Bestelldatum: Datumsformat nicht korrekt!", 3) : Return False + ' If Not VAL.checkValidDate(txtLieferung, True) Then Return False 'cProgramFunctions.setInfo(Me.FindForm, "ERR", "Lieferdatum: Datumsformat nicht korrekt!", 3) : Return False + ' If Not VAL.checkValidDate(txtGueltigkeit, True) Then Return False 'cProgramFunctions.setInfo(Me.FindForm, "ERR", "Gültigkeitsdatum: Datumsformat nicht korrekt!", 3) : Return False + Return True + End Function + + + + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtBestellung.PropertyChanged, txtLieferung.PropertyChanged, txtPLOSEKdNr.TextChanged, txtOBUID.TextChanged, txtKartenNr.TextChanged, txtPin.TextChanged, txtVermerk.TextChanged, cbxDefekt.CheckedChanged, cbxVerloren.CheckedChanged, cbxGestohlen.CheckedChanged, cbxGesperrt.CheckedChanged, cbxRetourniert.CheckedChanged, cbxArchiviert.CheckedChanged ' txtGueltigkeit2.PropertyChanged, + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub + + If boud And Me.FindForm IsNot Nothing Then + If sender Is txtLieferung Then + If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!") + End If + BindingTableColumnChanged() + End If + End Sub + Function addTxtToVermerk(tmp, txt) As String + If txtVermerk.Text <> "" Then tmp &= " / " + tmp &= txt & ", am " & Now.ToShortDateString + If tmp.Length > txtVermerk.MaxLength Then tmp = tmp.Substring(0, txtVermerk.MaxLength) + Return tmp + End Function +End Class diff --git a/SDL/mdm/frmNewData.Designer.vb b/SDL/mdm/frmNewData.Designer.vb index 817a6ff6..ff7e0ccc 100644 --- a/SDL/mdm/frmNewData.Designer.vb +++ b/SDL/mdm/frmNewData.Designer.vb @@ -59,6 +59,7 @@ Partial Class frmNewData Me.txtKundenNr = New System.Windows.Forms.TextBox() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.btnAddLeistungVordefiniert = New System.Windows.Forms.Button() + Me.btnSDL_PLOSE_TRUCKMASTER = New System.Windows.Forms.Button() Me.pnlMain.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -170,6 +171,7 @@ Partial Class frmNewData Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_IT) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_CZ) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_MEDPASS) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_TRUCKMASTER) Me.FlowLayoutPanel.Controls.Add(Me.btnVeragParkplatz) Me.FlowLayoutPanel.Controls.Add(Me.btnVeragParkplatzNEU) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Bottom @@ -605,7 +607,7 @@ Partial Class frmNewData Me.btnVeragParkplatz.ForeColor = System.Drawing.Color.Black Me.btnVeragParkplatz.Image = Global.SDL.My.Resources.Resources.verag_Card1 Me.btnVeragParkplatz.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnVeragParkplatz.Location = New System.Drawing.Point(250, 140) + Me.btnVeragParkplatz.Location = New System.Drawing.Point(332, 140) Me.btnVeragParkplatz.Margin = New System.Windows.Forms.Padding(2) Me.btnVeragParkplatz.Name = "btnVeragParkplatz" Me.btnVeragParkplatz.Size = New System.Drawing.Size(78, 64) @@ -626,7 +628,7 @@ Partial Class frmNewData Me.btnVeragParkplatzNEU.ForeColor = System.Drawing.Color.Black Me.btnVeragParkplatzNEU.Image = Global.SDL.My.Resources.Resources.verag_Card1 Me.btnVeragParkplatzNEU.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnVeragParkplatzNEU.Location = New System.Drawing.Point(332, 140) + Me.btnVeragParkplatzNEU.Location = New System.Drawing.Point(414, 140) Me.btnVeragParkplatzNEU.Margin = New System.Windows.Forms.Padding(2) Me.btnVeragParkplatzNEU.Name = "btnVeragParkplatzNEU" Me.btnVeragParkplatzNEU.Size = New System.Drawing.Size(78, 64) @@ -717,6 +719,26 @@ Partial Class frmNewData Me.btnAddLeistungVordefiniert.UseVisualStyleBackColor = True Me.btnAddLeistungVordefiniert.Visible = False ' + 'btnSDL_PLOSE_TRUCKMASTER + ' + Me.btnSDL_PLOSE_TRUCKMASTER.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnSDL_PLOSE_TRUCKMASTER.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_PLOSE_TRUCKMASTER.Enabled = False + Me.btnSDL_PLOSE_TRUCKMASTER.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver + Me.btnSDL_PLOSE_TRUCKMASTER.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_PLOSE_TRUCKMASTER.ForeColor = System.Drawing.Color.Black + Me.btnSDL_PLOSE_TRUCKMASTER.Image = Global.SDL.My.Resources.Resources.plose_truckmaster + Me.btnSDL_PLOSE_TRUCKMASTER.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_PLOSE_TRUCKMASTER.Location = New System.Drawing.Point(250, 140) + Me.btnSDL_PLOSE_TRUCKMASTER.Margin = New System.Windows.Forms.Padding(2) + Me.btnSDL_PLOSE_TRUCKMASTER.Name = "btnSDL_PLOSE_TRUCKMASTER" + Me.btnSDL_PLOSE_TRUCKMASTER.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_PLOSE_TRUCKMASTER.TabIndex = 63 + Me.btnSDL_PLOSE_TRUCKMASTER.Tag = "218" + Me.btnSDL_PLOSE_TRUCKMASTER.Text = "TruckMaster" + Me.btnSDL_PLOSE_TRUCKMASTER.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_PLOSE_TRUCKMASTER.UseVisualStyleBackColor = True + ' 'frmNewData ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -773,4 +795,5 @@ Partial Class frmNewData Friend WithEvents btnSDL_PLOSE_CZ As Button Friend WithEvents btnSDL_PLOSE_MEDPASS As Button Friend WithEvents btnVeragParkplatzNEU As Button + Friend WithEvents btnSDL_PLOSE_TRUCKMASTER As Button End Class diff --git a/SDL/mdm/frmNewData.vb b/SDL/mdm/frmNewData.vb index dd5a1fb9..23be944c 100644 --- a/SDL/mdm/frmNewData.vb +++ b/SDL/mdm/frmNewData.vb @@ -206,6 +206,7 @@ Public Class frmNewData Case 215 : btnAddLeistungVordefiniert.Image = My.Resources.plose_it : btnAddLeistungVordefiniert.Text = "PLOSE IT" & vbNewLine & "hinzufügen" Case 216 : btnAddLeistungVordefiniert.Image = My.Resources.plose_cz : btnAddLeistungVordefiniert.Text = "PLOSE CZ" & vbNewLine & "hinzufügen" Case 217 : btnAddLeistungVordefiniert.Image = My.Resources.plose_medpass : btnAddLeistungVordefiniert.Text = "MEDPASS" & vbNewLine & "hinzufügen" + Case 218 : btnAddLeistungVordefiniert.Image = My.Resources.plose_truckmaster : btnAddLeistungVordefiniert.Text = "TruckMaster" & vbNewLine & "hinzufügen" Case 209 : btnAddLeistungVordefiniert.Image = My.Resources.viatoll : btnAddLeistungVordefiniert.Text = "Maut PL" & vbNewLine & "hinzufügen" Case 210 : btnAddLeistungVordefiniert.Image = My.Resources.abc_obu : btnAddLeistungVordefiniert.Text = "Maut SI" & vbNewLine & "hinzufügen" Case 208 : btnAddLeistungVordefiniert.Image = My.Resources.mse : btnAddLeistungVordefiniert.Text = "MSE" & vbNewLine & "hinzufügen" @@ -256,7 +257,7 @@ Public Class frmNewData Private Sub btnSDL_Woelfl_Click(sender As Object, e As EventArgs) Handles btnSDL_Woelfl.Click, btnSDL_IDS.Click, btnSDL_MautAT.Click, btnSDL_MautDE.Click, btnSDL_MautMSE.Click, btnSDL_UTA.Click, btnSDL_MautPL.Click, btnSDL_MautIT.Click, btnSDL_MautSI.Click, btnSDL_MautCZ.Click, btnSDL_ECOTAX.Click, btnSDL_FREJUS.Click, btnSDL_Hugo.Click, btnSDL_DouBox.Click, btnSDL_MotorWay.Click, btnSDL_MautFR.Click, btnAddLeistungVordefiniert.Click, btnSDL_MANAbgas.Click, - btnVeragParkplatz.Click, btnSDL_PLOSE.Click, btnSDL_PLOSE_IT.Click, btnSDL_PLOSE_CZ.Click, btnSDL_PLOSE_MEDPASS.Click, btnVeragParkplatzNEU.Click + btnVeragParkplatz.Click, btnSDL_PLOSE.Click, btnSDL_PLOSE_IT.Click, btnSDL_PLOSE_CZ.Click, btnSDL_PLOSE_MEDPASS.Click, btnVeragParkplatzNEU.Click, btnSDL_PLOSE_TRUCKMASTER.Click If KdSearchBox1.KdNr <= 0 Then MsgBox("Kunde auswählen!") : Exit Sub diff --git a/SDL/mdm/usrCntlDatenDetails.vb b/SDL/mdm/usrCntlDatenDetails.vb index d38b2047..1383d472 100644 --- a/SDL/mdm/usrCntlDatenDetails.vb +++ b/SDL/mdm/usrCntlDatenDetails.vb @@ -265,6 +265,17 @@ Public Class usrCntlDatenDetails AddHandler usrcntl.CHANGED, Sub(kdNr, Kfz, SDLNr, History) RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History) End Sub + ElseIf SDLLeistung = 218 Then ' PLOSE TRUCK MASTER + pic.Image = Nothing + Dim usrcntl As New usrCntlSDLLeistungenPLOSE_TRUCKMASTER(kdnr, KfzKennzeichen, SDLLeistung, history) + usrcntl.Dock = DockStyle.Fill + pnlSDLLeistungenDetails.Controls.Add(usrcntl) + AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) + RaiseEvent Changed(kdNr, newKfz, SDLNr, History) + End Sub + AddHandler usrcntl.CHANGED, Sub(kdNr, Kfz, SDLNr, History) + RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History) + End Sub ElseIf SDLLeistung = 500 Then ' MAN pic.Image = Nothing diff --git a/SDL/mdm/usrCntlKartenDaten.Designer.vb b/SDL/mdm/usrCntlKartenDaten.Designer.vb index 7bb7ca1e..4122f8dd 100644 --- a/SDL/mdm/usrCntlKartenDaten.Designer.vb +++ b/SDL/mdm/usrCntlKartenDaten.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlKartenDaten _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnSDL_Alle = New System.Windows.Forms.Button() @@ -50,6 +50,7 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE_IT = New System.Windows.Forms.Button() Me.btnSDL_PLOSE_CZ = New System.Windows.Forms.Button() Me.btnSDL_PLOSE_MEDPASS = New System.Windows.Forms.Button() + Me.btnSDL_PLOSE_TRUCKMASTER = New System.Windows.Forms.Button() Me.btnFilter = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -132,6 +133,7 @@ Partial Class usrCntlKartenDaten Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_IT) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_CZ) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_MEDPASS) + Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_TRUCKMASTER) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 0) Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(0) @@ -559,6 +561,23 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE_MEDPASS.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnSDL_PLOSE_MEDPASS.UseVisualStyleBackColor = True ' + 'btnSDL_PLOSE_TRUCKMASTER + ' + Me.btnSDL_PLOSE_TRUCKMASTER.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_PLOSE_TRUCKMASTER.FlatAppearance.BorderSize = 0 + Me.btnSDL_PLOSE_TRUCKMASTER.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_PLOSE_TRUCKMASTER.ForeColor = System.Drawing.Color.Black + Me.btnSDL_PLOSE_TRUCKMASTER.Image = Global.SDL.My.Resources.Resources.plose_truckmaster + Me.btnSDL_PLOSE_TRUCKMASTER.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_PLOSE_TRUCKMASTER.Location = New System.Drawing.Point(560, 64) + Me.btnSDL_PLOSE_TRUCKMASTER.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_PLOSE_TRUCKMASTER.Name = "btnSDL_PLOSE_TRUCKMASTER" + Me.btnSDL_PLOSE_TRUCKMASTER.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_PLOSE_TRUCKMASTER.TabIndex = 46 + Me.btnSDL_PLOSE_TRUCKMASTER.Text = "TruckMaster" + Me.btnSDL_PLOSE_TRUCKMASTER.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_PLOSE_TRUCKMASTER.UseVisualStyleBackColor = True + ' 'btnFilter ' Me.btnFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -888,8 +907,8 @@ Partial Class usrCntlKartenDaten Me.dgvSDL.AllowUserToAddRows = False Me.dgvSDL.AllowUserToDeleteRows = False Me.dgvSDL.AllowUserToResizeColumns = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDL.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDL.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvSDL.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvSDL.Location = New System.Drawing.Point(0, -1) Me.dgvSDL.Name = "dgvSDL" @@ -1048,4 +1067,5 @@ Partial Class usrCntlKartenDaten Friend WithEvents btnSDL_PLOSE_CZ As Button Friend WithEvents btnSDL_PLOSE_MEDPASS As Button Friend WithEvents btnVERAGCardNew As Button + Friend WithEvents btnSDL_PLOSE_TRUCKMASTER As Button End Class diff --git a/SDL/mdm/usrCntlKartenDaten.vb b/SDL/mdm/usrCntlKartenDaten.vb index a1874211..3544197a 100644 --- a/SDL/mdm/usrCntlKartenDaten.vb +++ b/SDL/mdm/usrCntlKartenDaten.vb @@ -95,6 +95,7 @@ Public Class usrCntlKartenDaten btnSDL_PLOSE_IT.Visible = dt.Select("SDLNr=215").Count > 0 btnSDL_PLOSE_CZ.Visible = dt.Select("SDLNr=216").Count > 0 btnSDL_PLOSE_MEDPASS.Visible = dt.Select("SDLNr=217").Count > 0 + btnSDL_PLOSE_TRUCKMASTER.Visible = dt.Select("SDLNr=218").Count > 0 btnMANAbgasplakette.Visible = dt.Select("SDLNr=500").Count > 0 btnVERAGParkplatz.Visible = dt.Select("SDLNr=501").Count > 0 btnVERAGCardNew.Visible = dt.Select("SDLNr=502").Count > 0 @@ -126,6 +127,7 @@ Public Class usrCntlKartenDaten btnSDL_PLOSE_IT.Visible = dt.Select("SDLNr=215").Count > 0 btnSDL_PLOSE_CZ.Visible = dt.Select("SDLNr=216").Count > 0 btnSDL_PLOSE_MEDPASS.Visible = dt.Select("SDLNr=217").Count > 0 + btnSDL_PLOSE_TRUCKMASTER.Visible = dt.Select("SDLNr=218").Count > 0 btnMANAbgasplakette.Visible = dt.Select("SDLNr=500").Count > 0 btnVERAGParkplatz.Visible = dt.Select("SDLNr=501").Count > 0 btnVERAGCardNew.Visible = dt.Select("SDLNr=502").Count > 0 @@ -517,6 +519,7 @@ Public Class usrCntlKartenDaten Case 215 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [TELEPASS-Nr], PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=215" Case 216 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr, OBUID, PIN, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=216" Case 217 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, OBUID, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=217" + Case 218 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, OBUID, PLOSEKundenNr, /*GültigBis,*/Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN [VERAG].[dbo].Adressen ON [VERAG].[dbo].Adressen.AdressenNr=SDL.KundenNr WHERE SDLNr=218" Case 209 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=209" Case 210 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, OBUID, [SERIE-Nr],Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=210" Case 208 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], KartenNr, GültigBis,Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Retourniert, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=208" @@ -571,6 +574,7 @@ Public Class usrCntlKartenDaten Case 215 : Return btnSDL_PLOSE_IT Case 216 : Return btnSDL_PLOSE_CZ Case 217 : Return btnSDL_PLOSE_MEDPASS + Case 218 : Return btnSDL_PLOSE_TRUCKMASTER Case 209 : Return btnSDL_MautPL Case 210 : Return btnSDL_MautSI Case 208 : Return btnSDL_MautMSE @@ -733,7 +737,7 @@ Public Class usrCntlKartenDaten End If btnRetourniert.Enabled = False - If (sdlNr = 202 Or sdlNr = 203 Or sdlNr = 209 Or sdlNr = 210 Or sdlNr = 211 Or sdlNr = 213 Or sdlNr = 214 Or sdlNr = 215 Or sdlNr = 216 Or sdlNr = 217) Then + If (sdlNr = 202 Or sdlNr = 203 Or sdlNr = 209 Or sdlNr = 210 Or sdlNr = 211 Or sdlNr = 213 Or sdlNr = 214 Or sdlNr = 215 Or sdlNr = 216 Or sdlNr = 217 Or sdlNr = 218) Then btnRetourniert.Enabled = True End If @@ -750,6 +754,7 @@ Public Class usrCntlKartenDaten If sdlNr = 215 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 216 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 217 Then btnBenachrichtigungKartenboxen.Enabled = True + If sdlNr = 218 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 208 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 207 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 101 Then btnBenachrichtigungKartenboxen.Enabled = True @@ -1091,7 +1096,7 @@ Public Class usrCntlKartenDaten Dim von = Now.AddMonths(-6) Select Case aktSDLNr - Case "213", "214", "215", "216", "217", "211" : von = "01.01.2000" + Case "213", "214", "215", "216", "217", "218", "211" : von = "01.01.2000" End Select cMDMAuswertung.genUeberfaelligeBestellungen(Me.FindForm, von, Now, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, kdNr, IIf(IsNumeric(aktSDLNr), aktSDLNr, -1)) 'Now.AddMonths(-6) -_> Lieferdatum vormals -6M @@ -1168,7 +1173,7 @@ Public Class usrCntlKartenDaten Case 214 : pfad = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Retour\PLOSE.doc" Case 215 : pfad = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Retour\PLOSE_IT.doc" Case 216 : pfad = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Retour\PLOSE_CZ.doc" - Case 217 : pfad = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Retour\PLOSE.doc" + Case 217, 218 : pfad = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Retour\PLOSE.doc" End Select If Not System.IO.File.Exists(pfad) Then @@ -1195,6 +1200,7 @@ Public Class usrCntlKartenDaten Case 215 : odoc = getWordRetourniert_PLOSE_IT(odoc, kdNr, datum) Case 216 : odoc = getWordRetourniert_PLOSE_MEDPASS(odoc, kdNr, datum) Case 217 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum) + Case 218 : odoc = getWordRetourniert_PLOSE_TRUCKMASTER(odoc, kdNr, datum) Case Else : odoc.Close() : MsgBox("Falsche Leistung") End Select @@ -1426,6 +1432,43 @@ Public Class usrCntlKartenDaten Return odoc End Function + Function getWordRetourniert_PLOSE_TRUCKMASTER(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date) As Microsoft.Office.Interop.Word.Document + Try + Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=218 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'") + Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr) + If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc + Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr) + + Dim oTable As Word.Table + odoc.FormFields("Anzahl").Range.Text = dt.Rows.Count + odoc.FormFields("KdName").Range.Text = KUNDE.Name_1 & " " & KUNDE.Name_2 + odoc.FormFields("KdStrasse").Range.Text = KUNDE.Straße + odoc.FormFields("KdOrt").Range.Text = KUNDE.LandKz & " " & KUNDE.PLZ & " " & KUNDE.Ort + odoc.FormFields("KdNrVERAG").Range.Text = KUNDE.KundenNr + odoc.FormFields("KdNrMST").Range.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr + odoc.FormFields("Sachbearbeiter").Range.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + + If odoc.Range.Bookmarks.Exists("TabelleKarten2") Then + If odoc.Bookmarks("TabelleKarten2").Range.Tables.Count > 0 Then + oTable = odoc.Bookmarks("TabelleKarten2").Range.Tables(1) + Dim i = 1 + For Each r As DataRow In dt.Rows + oTable.Rows(i + 1).Cells(1).Range.Text = cSqlDb.checkNullStr(r("KfzKennzeichen")) + oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KartenNr")) + oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("OBUID")) + If i < dt.Rows.Count Then oTable.Rows.Add() + i += 1 + Next + End If + Else + MessageBox.Show("Textmarke nicht vorhanden!") + End If + Catch ex As Exception + MessageBox.Show(ex.ToString) + End Try + Return odoc + End Function + Function getWordRetourniert_MULTI(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date) As Microsoft.Office.Interop.Word.Document Try Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=211 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'") @@ -1648,4 +1691,7 @@ Public Class usrCntlKartenDaten Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles btnSDL_PLOSE_MEDPASS.Click SET_SDL(217) End Sub + Private Sub Buttonx_Click_1(sender As Object, e As EventArgs) Handles btnSDL_PLOSE_TRUCKMASTER.Click + SET_SDL(218) + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index da323d74..4e09b163 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -987,9 +987,20 @@ Public Class SQL End Select Return where End Function - Public Function getFMZOLLKdNrFromEORI(ByVal eori As String, eoriNL As String) As String + Function getFirmaWhere(Firma As String) + Dim where = "" + Select Case Firma + Case "IMEX" : where &= " AND [FilialenNr]='5501' " + Case "UNISPED" : where &= " AND [FilialenNr]='5601' " + Case "AMBAR" : where &= " AND [FilialenNr]='5701' " + Case "FRONTOFFICE" : where &= " AND [FilialenNr]='5801' " + Case Else : where &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') " + End Select + Return where + End Function + Public Function getFMZOLLKdNrFromEORI(ByVal eori As String, eoriNL As String, Firma As String) As String Dim s As String = "" - Dim where = getFirmaWhere() + Dim where = getFirmaWhere(Firma) Try Dim conn As SqlConnection = GetNewOpenConnectionFMZOLL() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb b/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb index 032e0b3a..5313f825 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb @@ -958,10 +958,10 @@ Public Class cNCTS_TR - Shared Function getAdresseFromEORI(EORI As String, EORI_NL As String, SQL As VERAG_PROG_ALLGEMEIN.SQL) + Shared Function getAdresseFromEORI(EORI As String, EORI_NL As String, SQL As VERAG_PROG_ALLGEMEIN.SQL, Firma As String) If EORI Is Nothing Then Return Nothing If If(EORI, "") <> "" Then - Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL) + Dim kdNrTmp = SQL.getFMZOLLKdNrFromEORI(EORI, EORI_NL, Firma) If IsNumeric(kdNrTmp) Then Dim ADRESSE As New VERAG_PROG_ALLGEMEIN.cAdressen(kdNrTmp) Return ADRESSE