Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas
===================================================================
diff -u -r175 -r198
--- AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 175)
+++ AAPClient/UI/DnaCodeReedsGescandScherm.pas	(.../DnaCodeReedsGescandScherm.pas)	(revision 198)
@@ -43,7 +43,7 @@
 implementation
 
 uses
-  UiContext, DnaCodeService;
+  UiContext, DnaCodeService, Agent;
 
 {$R *.dfm}
 
@@ -118,71 +118,35 @@
 
 procedure TfmDnaCodeReedsGescandScherm.Verplaatsen;
 var
-  Service: DnaCodeServiceSoap;
-  Request: HernoemPalletRequest;
   Response: HernoemPalletResponse;
-  Header: RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-  // request opbouwen
-  Request := HernoemPalletRequest.Create;
-  Header := RequestHeader.Create;
+  Response := TAgent.Create(UiContext).HernoemPallet(UiContext.Pallet, edtPallet.Text, UiContext.LaatsteDnaCode);
   try
-    Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := FullName();
-    Request.Header := Header;
-    Request.OudeCode := UiContext.Pallet;
-    Request.NieuweCode := edtPallet.Text;
-    Request.EnkelDezeDnaCode := UiContext.LaatsteDnaCode;
-    Response := Service.HernoemPallet(Request);
-    try
-      if Response.Header.Status <> '200' then begin
-        ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
-      end else begin
-        ToonPopupScherm(Response.Header.Omschrijving, 'OK','');
-        Self.ModalResult := mrDnaCode;
-      end;
-    finally
-      Response.Free;
+    if Response.Header.Status <> '200' then begin
+      ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+    end else begin
+      ToonPopupScherm(Response.Header.Omschrijving, 'OK','');
+      Self.ModalResult := mrDnaCode;
     end;
   finally
-    Request.Free;
+    Response.Free;
   end;
   if Self.ModalResult = mrDnaCode then
     CloseModal;
 end;
 
 procedure TfmDnaCodeReedsGescandScherm.Wegnemen;
 var
-  Service: DnaCodeServiceSoap;
-  Request: DnaCodeAfmeldenRequest;
   Response: DnaCodeAfmeldenResponse;
-  Header: RequestHeader;
 begin
   Self.ModalResult := mrDnaCode;
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-  // request opbouwen
-  Request := DnaCodeAfmeldenRequest.Create;
-  Header := RequestHeader.Create;
+  Response := TAgent.Create(UiContext).DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1);
   try
-    Header.Initialen := lblGebruiker.Caption;
-    Header.ComputerNaam := FullName();
-    Request.Header := Header;
-    Request.DnaCode := UiContext.LaatsteDnaCode;
-    Request.Aantal := -1;
-    Request.Toelevering := UiContext.Toelevering;
-    Request.PalletCode := UiContext.Pallet;
-
-    Response := Service.DnaCodeAfmelden(Request);
-    try
-      if Response.Header.Status <> '200' then begin
-        ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
-      end;
-    finally
-      Response.Free;
+    if Response.Header.Status <> '200' then begin
+      ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
     end;
   finally
-    Request.Free;
+    Response.Free;
   end;
 end;