Index: PlanScan/PlanScan.identcache
===================================================================
diff -u -r403 -r404
Binary files differ
Index: ProScan/UI/PalletScherm.dfm
===================================================================
diff -u -r399 -r404
--- ProScan/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 399)
+++ ProScan/UI/PalletScherm.dfm	(.../PalletScherm.dfm)	(revision 404)
@@ -2,7 +2,8 @@
   ActiveControl = edtPallet
   Caption = 'fmPalletScherm'
   OnActivate = FormActivate
-  OnHide = FormHide
+  ExplicitWidth = 480
+  ExplicitHeight = 640
   PixelsPerInch = 96
   TextHeight = 19
   object imgPallet: TImage [0]
@@ -420,6 +421,7 @@
     ImageIndex = 0
     ParentFont = False
     TabOrder = 3
+    Visible = False
     OnClick = btnGenereerTbpClick
   end
   inherited alAlgemeen: TActionList
Index: ProScan/WS/Agent.pas
===================================================================
diff -u -r403 -r404
--- ProScan/WS/Agent.pas	(.../Agent.pas)	(revision 403)
+++ ProScan/WS/Agent.pas	(.../Agent.pas)	(revision 404)
@@ -6,13 +6,6 @@
   DnaCodeService, GebruikerService, System.SysUtils, Vcl.Forms, UiContext, System.Classes;
 
 type
-{$M+}
-  IAgent = interface(IInvokable)
-  ['{3bedb3a0-3f59-4586-b3a8-80ff61cf8b1c}']
-    procedure GeefVolgendeTbpCodeprocedure();
-    function GeefVolgendeTbpCode(): GeefVolgendeTbpCodeResponse;
-  end;
-  {$M-}
   TAgent = class
   private
     fUiContext: TUiContext;
@@ -135,7 +128,6 @@
   Request: GeefVolgendeTbpCodeRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Result := GeefVolgendeTbpCodeResponse.Create;
   Request := GeefVolgendeTbpCodeRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
Index: ProScan/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r399 -r404
--- ProScan/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 399)
+++ ProScan/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 404)
@@ -6,7 +6,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ActnList, Images,
   Vcl.ImgList, UiContext, Vcl.ExtCtrls, Soap.InvokeRegistry, Soap.Rio,
-  Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn;
+  Soap.SOAPHTTPClient, Data.DB, Datasnap.DBClient, Soap.SOAPConn, Agent;
 
 type
   TfmDrieKnoppenScherm = class(TForm)
Index: ProScan/ProScan.identcache
===================================================================
diff -u -r403 -r404
Binary files differ
Index: ProScan/ProScan.dpr
===================================================================
diff -u -r399 -r404
--- ProScan/ProScan.dpr	(.../ProScan.dpr)	(revision 399)
+++ ProScan/ProScan.dpr	(.../ProScan.dpr)	(revision 404)
@@ -20,8 +20,7 @@
   Agent in 'WS\Agent.pas',
   CommonFunctions in 'UI\CommonFunctions.pas',
   MidasLib,
-  DnaCodeService in 'WS\DnaCodeService.pas',
-  BlPallet in 'BL\BlPallet.pas';
+  DnaCodeService in 'WS\DnaCodeService.pas';
 
 {$R *.res}
 
Index: ProScan/UI/PalletScherm.pas
===================================================================
diff -u -r403 -r404
--- ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 403)
+++ ProScan/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 404)
@@ -5,7 +5,7 @@
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList,
-  Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Imaging.pngimage, Agent, BlPallet;
+  Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Imaging.pngimage;
 
 type
   TfmPalletScherm = class(TfmDrieKnoppenScherm)
@@ -20,13 +20,12 @@
       Shift: TShiftState);
     procedure btnGenereerTbpClick(Sender: TObject);
     procedure FormActivate(Sender: TObject);
-    procedure FormHide(Sender: TObject);
   private
-    fBlPallet: TBlPallet;
     procedure SetContext;
     procedure SetModus(GescandeInput: string);
     function ValideerPalletCode(GescandeInput: string): boolean;
   public
+    { Public declarations }
   end;
 
 var
@@ -35,7 +34,7 @@
 implementation
 
 uses
-  DnaCodeService, UiContext, ProScanMain, StrUtils, CommonFunctions;
+  DnaCodeService, UiContext, Agent, ProScanMain, StrUtils, CommonFunctions;
 
 {$R *.dfm}
 
@@ -52,15 +51,15 @@
   fZoekViaToeleveringResponse: ZoekViaToeleveringResponse;
   fPalletGevalideerd: boolean;
 begin
-  SetModus(UiContext.Pallet);
+  SetModus(edtPallet.Text);
 
   fPalletGevalideerd := false;
   if not (UiContext.Modus = modusKAD) then
-    fPalletGevalideerd := ValideerPalletCode(UiContext.Pallet);
+    fPalletGevalideerd := ValideerPalletCode(edtPallet.Text);
 
   //checken of pallet in gebruik is indien het vorige geslaagd is
   if fPalletGevalideerd and not(UiContext.Modus = modusKAD )then begin
-    fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet);
+    fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(edtPallet.Text);
     try
       if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
         UiContext.Toelevering := fZoekViaPalletCodeResponse.DnaCodes[0].Toelevering;
@@ -94,13 +93,12 @@
 begin
   // pallet code valideren
   result := false;
-  fValideerPalletCodeResponse := TAgent.Create(UiContext).ValideerPalletCode(GescandeInput);
+  fValideerPalletCodeResponse := TAgent.Create(UiContext).ValideerPalletCode(edtPallet.Text);
   try
     if fValideerPalletCodeResponse.Header.Status <> '200' then begin
       Self.ModalResult := mrPallet;
       ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
       edtPallet.Text := '';
-      UiContext.Pallet := '';
       SetContext;
     end else begin
       result := true;
@@ -111,16 +109,25 @@
 end;
 
 procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject);
+var
+  fGeefVolgendeTbpCodeResponse: GeefVolgendeTbpCodeResponse;
 begin
   inherited;
+  fGeefVolgendeTbpCodeResponse := TAgent.Create(UiContext).GeefVolgendeTbpCode();
   try
-    fBlPallet.GenereerTbp;
-    actVolgendeExecute(Self);
-  except
-    on e: EExternalException do begin
-      ToonPopupScherm(e.Message, 'Probeer opnieuw');
+    if fGeefVolgendeTbpCodeResponse.Header.Status <> '200' then begin
+      Self.ModalResult := mrPallet;
+      ToonPopupScherm(fGeefVolgendeTbpCodeResponse.Header.Omschrijving, 'Probeer opnieuw');
+      edtPallet.Text := '';
+    end else begin
+      edtPallet.Text := fGeefVolgendeTbpCodeResponse.VolgendeTbpCode;
+      UiContext.Toelevering := '';
     end;
+  SetContext;
+  finally
+    fGeefVolgendeTbpCodeResponse.Free;
   end;
+  actVolgendeExecute(Self);
 end;
 
 procedure TfmPalletScherm.edtPalletKeyUp(Sender: TObject; var Key: Word;
@@ -140,15 +147,8 @@
   ActiveControl := edtPallet;
 end;
 
-procedure TfmPalletScherm.FormHide(Sender: TObject);
-begin
-  inherited;
-  fBlPallet.Free;
-end;
-
 procedure TfmPalletScherm.FormShow(Sender: TObject);
 begin
-  fBlPallet := TBlPallet.Create(UiContext,nil);
   btnLinksOnder.Action := nil;
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
Index: ProScan/ProScan.dproj
===================================================================
diff -u -r403 -r404
--- ProScan/ProScan.dproj	(.../ProScan.dproj)	(revision 403)
+++ ProScan/ProScan.dproj	(.../ProScan.dproj)	(revision 404)
@@ -70,8 +70,7 @@
 			<DCC_RemoteDebug>true</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-			<DCC_UnitSearchPath>E:\svn\Delphi\Mocks\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<Debugger_RunParams>displaymode=desktop server=tve-w10</Debugger_RunParams>
+			<Debugger_RunParams>displaymode=desktop server=cache01</Debugger_RunParams>
 			<Icon_MainIcon>ProScan_Icon.ico</Icon_MainIcon>
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 			<VerInfo_Locale>1033</VerInfo_Locale>
@@ -133,7 +132,6 @@
 			<DCCReference Include="WS\Agent.pas"/>
 			<DCCReference Include="UI\CommonFunctions.pas"/>
 			<DCCReference Include="WS\DnaCodeService.pas"/>
-			<DCCReference Include="BL\BlPallet.pas"/>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>
@@ -192,7 +190,7 @@
 					<Platform value="Win32">True</Platform>
 				</Platforms>
 				<UnitTesting>
-					<TestProjectName>E:\svn\Delphi\ProScan\Test\ProScanTests.dproj</TestProjectName>
+					<TestProjectName>E:\svn\Delphi\AAPClient\Test\ProScanTests.dproj</TestProjectName>
 				</UnitTesting>
 			</BorlandProject>
 			<ProjectFileVersion>12</ProjectFileVersion>
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.ParamMatcher.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Behavior.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Utils.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Validation.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.When.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.VirtualInterface.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.ReturnTypePatch.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.MethodData.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.ObjectProxy.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.WeakReference.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Interfaces.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Expectation.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.inc'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Helpers.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.VirtualMethodInterceptor.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.AutoMock.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Proxy.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `Mocks/Source/Delphi.Mocks.Proxy.TypeInfo.pas'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 404 refers to a dead (removed) revision in file `ProScan/BL/BlPallet.pas'.
FishEye: No comparison available.  Pass `N' to diff?