Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r201 -r218
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 201)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 218)
@@ -28,7 +28,6 @@
     procedure FormShow(Sender: TObject);
     procedure actHomeExecute(Sender: TObject);
     procedure actVolgendeExecute(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
     procedure btnEerstClick(Sender: TObject);
     procedure btnVorigeClick(Sender: TObject);
     procedure btnVolgendeClick(Sender: TObject);
@@ -38,9 +37,11 @@
     procedure edtNieuweCodeKeyUp(Sender: TObject; var Key: Word;
       Shift: TShiftState);
   private
+    fEnkelDezeDnaCode: string;
     procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode);
     procedure GridLeegmaken;
     function HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse;
+    function CheckBestaandeDnaCode(Code: string): boolean;
   public
     { Public declarations }
   end;
@@ -65,7 +66,14 @@
 begin
   inherited;
   if pcHernoemPallet.ActivePageIndex = 0 then begin
-    HernoemPallet(edtOudeCode.Text,'');
+    fEnkelDezeDnaCode := '';
+    if ((length(edtOudeCode.Text)=7) and CheckBestaandeDnaCode(edtOudeCode.Text)) then begin
+      if ToonPopupScherm('Enkel code ''' + edtOudeCode.Text + ''' verwerken?','Ja','Nee') = mrYes then begin
+         fEnkelDezeDnaCode := edtOudeCode.Text
+      end;
+    end;
+
+    HernoemPallet(edtOudeCode.Text,fEnkelDezeDnaCode);
   end else if pcHernoemPallet.ActivePageIndex = 1 then begin
     pcHernoemPallet.ActivePageIndex := 2;
   end else if pcHernoemPallet.ActivePageIndex = 2 then begin
@@ -99,6 +107,26 @@
     sgToeleveringData.Row := sgToeleveringData.Row - 1;
 end;
 
+function TfmHernoemPalletScherm.CheckBestaandeDnaCode(Code: string): boolean;
+var
+  Response: ZoekViaDnaCodeResponse;
+begin
+  Response := TAgent.Create(UiContext).ZoekViaDnaCode(Code);
+  try
+    if Response.Header.Status <> '200' then begin
+      result := false
+    end else begin
+      if Assigned(Response.DnaCodes) then begin
+        result := true
+      end else begin
+        result := false
+      end;
+    end;
+  finally
+    Response.Free;
+  end;
+end;
+
 procedure TfmHernoemPalletScherm.edtNieuweCodeKeyUp(Sender: TObject;
   var Key: Word; Shift: TShiftState);
 begin
@@ -123,7 +151,7 @@
 var
   Response: HernoemPalletResponse;
 begin
-  Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, '');
+  Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, fEnkelDezeDnaCode);
   try
     if Response.Header.Status <> '200' then begin
       ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
@@ -144,19 +172,14 @@
     CloseModal;
 end;
 
-procedure TfmHernoemPalletScherm.FormCreate(Sender: TObject);
-begin
-  inherited;
-  pcHernoemPallet.ActivePageIndex := 0;
-end;
-
 procedure TfmHernoemPalletScherm.FormShow(Sender: TObject);
 begin
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
   pcHernoemPallet.ActivePageIndex := 0;
   edtOudeCode.Text := '';
   edtNieuweCode.Text := '';
+  edtOudeCode.SetFocus;
   GridLeegmaken;
   inherited;
 end;