Index: EWMS/Locations.cls.xml
===================================================================
diff -u -r5059 -r5108
--- EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5059)
+++ EWMS/Locations.cls.xml	(.../Locations.cls.xml)	(revision 5108)
@@ -462,6 +462,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsLocatieLeeg">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LocM:%Library.String,LocG:%Library.String,LocX:%Library.String,LocY:%Library.String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set IsLocatieLeeg = 1
+	New RS
+	Set RS = ##class(%ResultSet).%New("EWMS.Locations:CheckIfLocationIsEmpty")
+	Do RS.Execute(LocM,LocG,LocX,LocY)
+	If RS.Next(){
+		Set IsLocatieLeeg = 0
+	}
+	Quit IsLocatieLeeg
+]]></Implementation>
+</Method>
+
 <Query name="CheckIfLocationExists">
 <Type>%Library.SQLQuery</Type>
 <FormalSpec>LocID:%Library.String,LocM:%Library.String,LocG:%Library.String,LocX:%Library.String,LocY:%Library.String,LocZ:%Library.String</FormalSpec>
Index: UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml
===================================================================
diff -u -r5094 -r5108
--- UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml	(.../dlgReceptieScanNadien.cls.xml)	(revision 5094)
+++ UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml	(.../dlgReceptieScanNadien.cls.xml)	(revision 5108)
@@ -184,15 +184,15 @@
  ;    Height = 21
  ;    Enabled = False
  ;    TabOrder = 0
- ;    Text = 'txtPalletID'
+ ;    Text = ''
  ;  end
  ;  object txtLocatieID: CEdit
  ;    Left = 77
  ;    Top = 138
  ;    Width = 145
  ;    Height = 21
  ;    TabOrder = 1
- ;    Text = 'txtLocatieID'
+ ;    Text = ''
  ;  end
  ;  object btnBevestig: CButton
  ;    Left = 9
@@ -281,8 +281,8 @@
  d %this.Label2.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clBlue,-13,"MS Sans Serif",$lb("fsBold")))
  d %this.Label3.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont"),$lb(13,140,56,16,"Locatie:","False"))
  d %this.Label3.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clBlue,-13,"MS Sans Serif",$lb("fsBold")))
- d %this.txtPalletID.SetMultiProperty($lb("Left","Top","Width","Height","Enabled","TabOrder","Text"),$lb(77,24,145,21,"False",0,"txtPalletID"))
- d %this.txtLocatieID.SetMultiProperty($lb("Left","Top","Width","Height","TabOrder","Text"),$lb(77,138,145,21,1,"txtLocatieID"))
+ d %this.txtPalletID.SetMultiProperty($lb("Left","Top","Width","Height","Enabled","TabOrder","Text"),$lb(77,24,145,21,"False",0,""))
+ d %this.txtLocatieID.SetMultiProperty($lb("Left","Top","Width","Height","TabOrder","Text"),$lb(77,138,145,21,1,""))
  d %this.btnBevestig.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","OnClick"),$lb(9,197,91,40,"BEVESTIG","False",2,$lb(%this,"btnBevestigClick")))
  d %this.btnBevestig.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb("fsBold")))
  d %this.btnTransit.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","OnClick"),$lb(107,197,115,40,"IN TRANSIT","False",3,$lb(%this,"btnTransitClick")))
@@ -343,7 +343,8 @@
 <FormalSpec>LocatieID:%String</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	If (LocatieID '= ""){
+	Set Msg = ..ControleerLocatie(LocatieID)
+	If (Msg = ""){
 		Set LijnNr = $O(^UPRCP("B","TB",..VolgNr,""))
 		While (LijnNr '= ""){
 			Set PalletID = $Piece(^UPRCP("B","TB",..VolgNr,LijnNr),"\",3)
@@ -352,12 +353,35 @@
 		}
 		Do ..Form.Close()	
 	}Else{
-		Set Msg="De locatie '"_LocatieID_"' is niet geldig."
    		Do pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONEXCLAMATION,0)
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="ControleerLocatie">
+<FormalSpec>LocatieID:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Msg = ""
+	If (LocatieID '= "04020101"){
+		If '##class(EWMS.TransLoc).CheckLocTrans(LocatieID){
+			Set Msg = "De locatie '"_LocatieID_"' heeft geen correct formaat."	
+		}Else{
+			Set (LocM,LocG,LocX,LocY) = ""
+			Do ##class(EWMS.TransLoc).GetWMSLocation(LocatieID,.LocM,.LocG,.LocX,.LocY)	
+			If '##class(EWMS.Locations).BestaatLocatie(LocM,LocG,LocX,LocY){
+				Set Msg = "De locatie '"_LocatieID_"' bestaat niet."	
+			}Else{
+				If '##class(EWMS.Locations).IsLocatieLeeg(LocM,LocG,LocX,LocY){
+					Set Msg = "De locatie '"_LocatieID_"' is bezet."	
+				}	
+			}
+		}
+	}
+	Quit Msg
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="TMFormClassState">
Index: UI/MB/UGLYPicking/dlgReceptieSel.cls.xml
===================================================================
diff -u -r5093 -r5108
--- UI/MB/UGLYPicking/dlgReceptieSel.cls.xml	(.../dlgReceptieSel.cls.xml)	(revision 5093)
+++ UI/MB/UGLYPicking/dlgReceptieSel.cls.xml	(.../dlgReceptieSel.cls.xml)	(revision 5108)
@@ -845,6 +845,10 @@
  Else  If DefaultLocatie="ITS" Do
  . Set ..rbLocatieInTeScannen.Checked="True"
  . Set ..rdScanNadien.Checked="False"
+ Else 
+ . Set ..txtLocatieVast.Text=LocatieVast
+ . Set ..rdScanNadien.Checked="True"
+ . Set ..rbLocatieInTeScannen.Checked="False"
 
  ;End of user code
  s Args=$lb(Sender)
@@ -1012,7 +1016,7 @@
  . Set ..txtLocatieVast.Visible="False"
 
  If ..rdScanNadien.Checked="True" {
-  Set ..rbPalletInTeScannen.Checked="True"
+  Set ..rbPalletVast.Checked="True"
  }
 
  ;End of user code