Index: PlanScan/WS/Agent.pas
===================================================================
diff -u -r295 -r296
--- PlanScan/WS/Agent.pas	(.../Agent.pas)	(revision 295)
+++ PlanScan/WS/Agent.pas	(.../Agent.pas)	(revision 296)
@@ -11,6 +11,7 @@
     fUiContext: TUiContext;
     fServer: string;
     fGebruikerServiceSoap: GebruikerServiceSoap;
+    fDnaCodeServiceSoap: DnaCodeServiceSoap;
     function ComputerName: String;
     function WUserName: String;
   public
@@ -44,17 +45,15 @@
   fUiContext := UiContext;
   fServer := Server;
   fGebruikerServiceSoap := GebruikerService.GetGebruikerServiceSoap(false,'http://'+fServer+':57772/csp/dev1/WS.Halux.AAP.GebruikerService.cls',nil);
+  fDnaCodeServiceSoap := DnaCodeService.GetDnaCodeServiceSoap(false,'http://'+fServer+':57772/csp/dev1/WS.Halux.AAP.DnaCodeService.cls',nil)
 end;
 
 function TAgent.DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string;
   Aantal: integer): DnaCodeAfmeldenResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: DnaCodeAfmeldenRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := DnaCodeAfmeldenRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -66,7 +65,7 @@
     Request.PalletCode := PalletCode;
     Request.Aantal := Aantal;
 
-    Result := Service.DnaCodeAfmelden(Request);
+    Result := fDnaCodeServiceSoap.DnaCodeAfmelden(Request);
 
   finally
     Request.Free;
@@ -144,33 +143,27 @@
 
 function TAgent.GeefVolgendeTbpCode: GeefVolgendeTbpCodeResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: GeefVolgendeTbpCodeRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := GeefVolgendeTbpCodeRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
     Header.Initialen := fUiContext.Initialen;
     Header.ComputerNaam := FullName();
     Request.Header := Header;
 
-    result := Service.GeefVolgendeTbpCode(Request);
+    result := fDnaCodeServiceSoap.GeefVolgendeTbpCode(Request);
   finally
     Request.Free;
   end;
 end;
 
 function TAgent.HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string): HernoemPalletResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: HernoemPalletRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := HernoemPalletRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -181,20 +174,17 @@
     Request.NieuweCode := NieuweCode;
     Request.EnkelDezeDnaCode := EnkelDezeDnaCode;
 
-    result := Service.HernoemPallet(Request);
+    result := fDnaCodeServiceSoap.HernoemPallet(Request);
   finally
     Request.Free;
   end;
 end;
 
 function TAgent.IsDirecteLevering(Toelevering: string): DirecteLeveringResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: DirecteLeveringRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := DirecteLeveringRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -203,7 +193,7 @@
     Request.Header := Header;
     Request.Toelevering := Toelevering;
 
-    result := Service.IsDirecteLevering(Request);
+    result := fDnaCodeServiceSoap.IsDirecteLevering(Request);
   finally
     Request.Free;
   end;
@@ -212,12 +202,9 @@
 function TAgent.PalletBijwerken(Pallet: string; Status: DnaCodeStatus;
   IsDirecteLevering: boolean): PalletBijwerkenResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: PalletBijwerkenRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := PalletBijwerkenRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -228,7 +215,7 @@
     Request.Status := Status;
     Request.IsDirecteLevering := IsDirecteLevering;
 
-    result := Service.PalletBijwerken(Request);
+    result := fDnaCodeServiceSoap.PalletBijwerken(Request);
   finally
     Request.Free;
   end;
@@ -237,12 +224,9 @@
 function TAgent.ToeleveringBijwerken(Toelevering: string; Status: DnaCodeStatus;
   IsDirecteLevering: boolean): ToeleveringBijwerkenResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: ToeleveringBijwerkenRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := ToeleveringBijwerkenRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -253,20 +237,17 @@
     Request.Status := Status;
     Request.IsDirecteLevering := IsDirecteLevering;
 
-    result := Service.ToeleveringBijwerken(Request);
+    result := fDnaCodeServiceSoap.ToeleveringBijwerken(Request);
   finally
     Request.Free;
   end;
 end;
 
 function TAgent.ValideerPalletCode(PalletCode: string): ValideerPalletCodeResponse;
 var
-  Service: DnaCodeServiceSoap;
   Request: ValideerPalletCodeRequest;
   Header: DnaCodeService.RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   Request := ValideerPalletCodeRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -275,20 +256,17 @@
     Request.Header := Header;
     Request.PalletCode := PalletCode;
 
-    result := Service.ValideerPalletCode(Request);
+    result := fDnaCodeServiceSoap.ValideerPalletCode(Request);
   finally
     Request.Free;
   end;
 end;
 
 function TAgent.ZoekViaDnaCode(DnaCode: string): ZoekViaDnaCodeResponse;
 var
-  Service: DnaCodeServiceSoap;
   Header: DnaCodeService.RequestHeader;
   fZoekViaDnaCodeRequest: ZoekViaDnaCodeRequest;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   fZoekViaDnaCodeRequest := ZoekViaDnaCodeRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -297,7 +275,7 @@
     fZoekViaDnaCodeRequest.Header := Header;
     fZoekViaDnaCodeRequest.DnaCode := DnaCode;
 
-    result := Service.ZoekViaDnaCode(fZoekViaDnaCodeRequest);
+    result := fDnaCodeServiceSoap.ZoekViaDnaCode(fZoekViaDnaCodeRequest);
   finally
     fZoekViaDnaCodeRequest.Free;
   end;
@@ -306,12 +284,9 @@
 function TAgent.ZoekViaPalletCode(
   PalletCode: string): ZoekViaPalletCodeResponse;
 var
-  Service: DnaCodeServiceSoap;
   Header: DnaCodeService.RequestHeader;
   fZoekViaPalletCodeRequest: ZoekViaPalletCodeRequest;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   fZoekViaPalletCodeRequest := ZoekViaPalletCodeRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -320,7 +295,7 @@
     fZoekViaPalletCodeRequest.Header := Header;
     fZoekViaPalletCodeRequest.PalletCode := PalletCode;
 
-    result := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest);
+    result := fDnaCodeServiceSoap.ZoekViaPalletCode(fZoekViaPalletCodeRequest);
   finally
     fZoekViaPalletCodeRequest.Free;
   end;
@@ -329,12 +304,9 @@
 function TAgent.ZoekViaToelevering(
   Toelevering: string): ZoekViaToeleveringResponse;
 var
-  Service: DnaCodeServiceSoap;
   Header: DnaCodeService.RequestHeader;
   fZoekViaToeleveringRequest: ZoekViaToeleveringRequest;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   fZoekViaToeleveringRequest := ZoekViaToeleveringRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -343,22 +315,19 @@
     fZoekViaToeleveringRequest.Header := Header;
     fZoekViaToeleveringRequest.Toelevering := Toelevering;
 
-    result := Service.ZoekViaToelevering(fZoekViaToeleveringRequest);
+    result := fDnaCodeServiceSoap.ZoekViaToelevering(fZoekViaToeleveringRequest);
   finally
     fZoekViaToeleveringRequest.Free;
   end;
 end;
 
 function TAgent.ProboxEtiketAfdrukken(DnaCodesStringList: TStringList): ProboxEtiketAfdrukkenResponse;
 var
-  Service: DnaCodeServiceSoap;
   Header: DnaCodeService.RequestHeader;
   fProboxEtiketAfdrukkenRequest: ProboxEtiketAfdrukkenRequest;
   DnaCodesArray: ArrayOfStringString;
   ii: integer;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-
   fProboxEtiketAfdrukkenRequest := ProboxEtiketAfdrukkenRequest.Create;
   Header := DnaCodeService.RequestHeader.Create;
   try
@@ -377,7 +346,7 @@
 
     fProboxEtiketAfdrukkenRequest.DnaCodes := DnaCodesArray;
 
-    result := Service.ProboxEtiketAfdrukken(fProboxEtiketAfdrukkenRequest);
+    result := fDnaCodeServiceSoap.ProboxEtiketAfdrukken(fProboxEtiketAfdrukkenRequest);
   finally
     fProboxEtiketAfdrukkenRequest.Free;
   end;