Index: UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml
===================================================================
diff -u -r7960 -r7981
--- UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml	(.../dlgOpslagPalSel.cls.xml)	(revision 7960)
+++ UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml	(.../dlgOpslagPalSel.cls.xml)	(revision 7981)
@@ -530,7 +530,7 @@
  ;      Font.Height = -13
  ;      Font.Name = 'MS Sans Serif'
  ;      Font.Style = [fsBold]
- ;      MaxLength = 8
+ ;      MaxLength = 10
  ;      ParentCtl3D = False
  ;      ParentFont = False
  ;      TabOrder = 2
@@ -815,15 +815,30 @@
 </Method>
 
 <Method name="GeefBronPalletID">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	 Quit ..GeefPalletID(..txtBronPalletID.Text)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDoelPalletID">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	 Quit ..GeefPalletID(..txtDoelPalletID.Text)
+]]></Implementation>
+</Method>
+
+<Method name="GeefPalletID">
+<FormalSpec>PalletID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	 Set BronPalletID = ..txtBronPalletID.Text
-	 Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
-	 If (ProductionHelper.IsFrameID(BronPalletID))
+	Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	 If (ProductionHelper.IsFrameID(PalletID))
 	 {
-		Set BronPalletID = ProductionHelper.GeefPalletIDVanVHossID(BronPalletID)
+		Set PalletID = ProductionHelper.GeefPalletIDVanVHossID(PalletID)
 	 }	
-	 Quit BronPalletID
+	 Quit PalletID
 ]]></Implementation>
 </Method>
 
@@ -855,7 +870,7 @@
 
  New Result
  Set Result=$$$cmGeneral.CompleteLocationViaPalletID(.BronLocation,BronPalletID)
-
+ 
  If Result'="" Do  Quit
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Bronlocatie: "_Result,$$$MBICONINFORMATION)
 
@@ -865,7 +880,6 @@
 
  If DoelLocation="" Do  Quit
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Er is geen geldige doellocatie ingescand!",$$$MBICONINFORMATION)
-
  New Status   ;Volgende functie levert een $LB(ErrNr,ErrMsg) terug, indien ErrNr<0 toon ErrStr
  Set Status=$$$cmOpslag.VerplaatsPallet(BronLocation,DoelLocation,BronPalletID)
  If $LI(Status)<0 Do
@@ -874,7 +888,6 @@
  Else  Do
  . Do pdaMsgBox^vhVisual(..Form.Caption,$LI(Status,2),$$$MBICONINFORMATION)
  . Set ..Form.ModalResult=$$$mrOk
-
  Quit
 
  ;------------------------------------------------------------------------------
@@ -913,8 +926,8 @@
  Do ..dCOMPWRITEProdsOnPallet()
 
  New Status,HistoryRemark
- Set HistoryRemark="Wijzig "_..GeefBronPalletID()_"->"_..txtDoelPalletID.Text
- Set Status=$$$cmOpslag.ChangePalletID(..GeefBronPalletID(),..txtDoelPalletID.Text,HistoryRemark)
+ Set HistoryRemark="Wijzig "_..GeefBronPalletID()_"->"_..GeefDoelPalletID()
+ Set Status=$$$cmOpslag.ChangePalletID(..GeefBronPalletID(),..GeefDoelPalletID(),HistoryRemark)
 
  If $LI(Status)<0 Do
  . Do pdaMsgBox^vhVisual(..Form.Caption,$LI(Status,2),$$$MBICONERROR)
@@ -1114,7 +1127,7 @@
  d %this.lblHerhalingPallet.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold")))
  d %this.txtDoelLocatie.SetMultiProperty($lb("Left","Top","Width","Height","CharCase","Ctl3D","MaxLength","ParentCtl3D","ParentFont","TabOrder","OnKeyDown"),$lb(18,20,96,22,"ecUpperCase","False",8,"False","False",0,$lb(%this,"txtDoelLocatieKeyDown")))
  d %this.txtDoelLocatie.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold")))
- d %this.txtDoelPalletID.SetMultiProperty($lb("Left","Top","Width","Height","CharCase","Ctl3D","MaxLength","ParentCtl3D","ParentFont","TabOrder","OnKeyDown","OnKeyPress"),$lb(138,20,88,22,"ecUpperCase","False",8,"False","False",1,$lb(%this,"txtDoelPalletIDKeyDown"),$lb(%this,"txtPalletIDKeyPress")))
+ d %this.txtDoelPalletID.SetMultiProperty($lb("Left","Top","Width","Height","CharCase","Ctl3D","MaxLength","ParentCtl3D","ParentFont","TabOrder","OnKeyDown","OnKeyPress"),$lb(138,20,88,22,"ecUpperCase","False",10,"False","False",1,$lb(%this,"txtDoelPalletIDKeyDown"),$lb(%this,"txtPalletIDKeyPress")))
  d %this.txtDoelPalletID.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold")))
  d %this.txtConfirmDoelPalletID.SetMultiProperty($lb("Left","Top","Width","Height","CharCase","Ctl3D","MaxLength","ParentCtl3D","ParentFont","TabOrder","Visible","OnKeyDown","OnKeyPress"),$lb(138,50,88,22,"ecUpperCase","False",8,"False","False",2,"False",$lb(%this,"txtConfirmDoelPalletIDKeyDown"),$lb(%this,"txtPalletIDKeyPress")))
  d %this.txtConfirmDoelPalletID.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold")))
@@ -1490,7 +1503,7 @@
 <SoapBodyUse>literal</SoapBodyUse>
 <Implementation><![CDATA[
  ;Valideer ingescande/getypte waarden
- If ..txtDoelPalletID.Text="" Do  Quit 0
+ If ..GeefDoelPalletID()="" Do  Quit 0
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Er is geen doelpallet ingescand!",$$$MBICONINFORMATION)
 
  If ..txtDoelLocatie.Text="" Do  Quit 0
@@ -1503,7 +1516,7 @@
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Er is geen geldige doellocatie ingescand!",$$$MBICONINFORMATION)
 
  New Result
- Set Result=$$$cmGeneral.CompleteLocationViaPalletID(.Location,..txtDoelPalletID.Text,.IsNewPallet)
+ Set Result=$$$cmGeneral.CompleteLocationViaPalletID(.Location,..GeefDoelPalletID(),.IsNewPallet)
 
  If IsNewPallet Do  Quit 0
  . Do pdaMsgBox^vhVisual(..Form.Caption,"De opgegeven locatie bestaat niet.",$$$MBICONINFORMATION)
@@ -1945,7 +1958,7 @@
 
  If Key=$$$keyEnter Do
  . Set ..txtConfirmDoelPalletID.Text=$$AddLeadingChar^vhLib(..txtConfirmDoelPalletID.Text,"0",8)
- . If ..txtConfirmDoelPalletID.Text'=..txtDoelPalletID.Text Do
+ . If ..txtConfirmDoelPalletID.Text'=..GeefDoelPalletID() Do
  ..  Do pdaMsgBox^vhVisual(..Form.Caption,"Ingescande palletten komen niet overeen!",$$$MBICONINFORMATION)
  ..  Do ..iCOMPINITDoelLocAndPal()
  . Else  Do
@@ -2003,12 +2016,12 @@
 
  If (Key=$$$keyEnter) Do       ;&& ..dCOMPVALDoelLocAndPal() Do  ;eigenlijk gn validatie nodig van doel
  . Set:(..txtDoelLocatie.Text="") ..txtDoelLocatie.Text=..txtBronLocatie.Text
- . Set:(..txtDoelPalletID.Text="") ..txtDoelPalletID.Text=..GeefBronPalletID()
+ . Set:(..GeefDoelPalletID()="") ..txtDoelPalletID.Text=..GeefBronPalletID()
  . Set ..txtDoelLocatie.Text=$$AddLeadingChar^vhLib(..txtDoelLocatie.Text,"0",8)
- . Set ..txtDoelPalletID.Text=$$AddLeadingChar^vhLib(..txtDoelPalletID.Text,"0",8)
+ . Set ..txtDoelPalletID.Text=$$AddLeadingChar^vhLib(..GeefDoelPalletID(),"0",8)
  . New EqualLocations,EqualPalletIDs
  . Set EqualLocations=(..txtBronLocatie.Text=..txtDoelLocatie.Text)
- . Set EqualPalletIDs=(..GeefBronPalletID()=..txtDoelPalletID.Text)
+ . Set EqualPalletIDs=(..GeefBronPalletID()=..GeefDoelPalletID())
  . If EqualLocations Do
  ..  If EqualPalletIDs Do   ;(1)
  ...   Do pdaMsgBox^vhVisual(..Form.Caption,"Hoef pallet niet te verplaatsen: bron- en doelgegevens zijn identiek!",$$$MBICONINFORMATION)