Index: OBJTimpl/WMSOrder/dtoKlantEtiketRequest.cls.xml
===================================================================
diff -u -r67345 -r67356
--- OBJTimpl/WMSOrder/dtoKlantEtiketRequest.cls.xml	(.../dtoKlantEtiketRequest.cls.xml)	(revision 67345)
+++ OBJTimpl/WMSOrder/dtoKlantEtiketRequest.cls.xml	(.../dtoKlantEtiketRequest.cls.xml)	(revision 67356)
@@ -14,10 +14,6 @@
 <Property name="Vertrekplaats">
 <Type>%String</Type>
 </Property>
-
-<Property name="UserIdPicker">
-<Type>%String</Type>
-</Property>
 </Class>
 
 
Index: OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml
===================================================================
diff -u -r67350 -r67356
--- OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml	(.../OphalenUserIdPickerVanLPN.cls.xml)	(revision 67350)
+++ OBJTimpl/WMSOrder/OphalenUserIdPickerVanLPN.cls.xml	(.../OphalenUserIdPickerVanLPN.cls.xml)	(revision 67356)
@@ -44,36 +44,22 @@
 	
     Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
     #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
-	#dim Status as %String = ""
-    ;#dim SqlStatement as %String = "Select OUTBOUNDSTATUS FROM [OBJT_OUTBOUNDORDER] WHERE ID=?"
+	#dim UserIdPicker as %String = ""
     #dim SqlStatement as %String
-    Set SqlStatement = "select task.DTSSTART, outboundOrder.id, task.oid, employee.UserID, csitq.name, op.name, itemqty.VALUE " 
-    _ "from OBJT_TASK task"
-    _ "left join OBJT_PICKORDER pickorder"
-	_ "on task.ORDEROID = pickorder.OID"
-	_ "left join OBJT_ORDERLINK link"
-	_ "on link.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOrder'"
-	_ "and link.CHILDOID = pickorder.oid"
-	_ "left join OBJT_OUTBOUNDORDER outboundOrder"
-	_ "on outboundOrder.oid = link.PARENTOID"
-	_ "left join OBJT_EMPLOYEE employee"
-	_ "on employee.oid = task.EMPLOYEEOID"
-	_ "left join OBJT_CONTAINERSTORAGEITEMQTY csitq"
-	_ "on csitq.oid = task.CONTAINERSTORAGEITEMQTYOID"
-	_ "left join OBJT_OPERATIONLINK opLink"
-	_ "on opLink.CHILDOID = task.REFOID"
-	_ "and opLink.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOperation'"
-	_ "left join OBJT_OUTBOUNDOPERATION op"
-	_ "on op.oid = opLink.PARENTOID"
-
-	_ "left join OBJT_OUTBOUNDITEMQTY itemqty"
-	_ "on itemqty.OUTBOUNDOPERATIONOID = op.oid"
-
-	_ "where task.CATEGORY = 'PICK'"
-	_ "and outboundOrder.id = ?"
-	_ "and csitq.name = ?"
-
-
+    Set SqlStatement = "select task.DTSSTART, outboundOrder.id, task.oid, employee.UserID UserId, csitq.name, op.name, itemqty.VALUE " 
+    _ " from OBJT_TASK task"
+    _ " left join OBJT_PICKORDER pickorder on task.ORDEROID = pickorder.OID"
+	_ " left join OBJT_ORDERLINK link on link.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOrder' and link.CHILDOID = pickorder.oid"
+	_ " left join OBJT_OUTBOUNDORDER outboundOrder on outboundOrder.oid = link.PARENTOID"
+	_ " left join OBJT_EMPLOYEE employee on employee.oid = task.EMPLOYEEOID"
+	_ " left join OBJT_CONTAINERSTORAGEITEMQTY csitq on csitq.oid = task.CONTAINERSTORAGEITEMQTYOID"
+	_ " left join OBJT_OPERATIONLINK opLink on opLink.CHILDOID = task.REFOID and opLink.PARENTCLASSNAME = 'objt.wms.bo.outboundmgt.OutboundOperation'"
+	_ " left join OBJT_OUTBOUNDOPERATION op on op.oid = opLink.PARENTOID"
+	_ " left join OBJT_OUTBOUNDITEMQTY itemqty on itemqty.OUTBOUNDOPERATIONOID = op.oid"
+	_ " where task.CATEGORY = 'PICK'"
+	_ " and outboundOrder.id = ?"
+	_ " and csitq.name = ?"
+		
     try
     {
     	Do res.Prepare(SqlStatement,,OBJTConnection)
@@ -84,70 +70,13 @@
     }
     If res.Next()
     {
-	    Set Status=$G(res.Data("OUTBOUNDSTATUS"))
+	    Set UserIdPicker=$G(res.Data("UserId"))
     }
     do OBJTConnection.Disconnect()
 
-    Quit Status
+    Quit UserIdPicker
 ]]></Implementation>
 </Method>
-
-<Method name="GeefStatusVertaald">
-<FormalSpec>CONSNr:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim Status as %String =..GeefStatus(CONSNr)
-	
-	Quit:Status="" "Niet in OBJT"
-	Quit:Status=0 "Niet actief"
-	Quit:Status=1 "Gealloceerd"
-	Quit:Status=2 "Vrijgegeven"
-	Quit:Status=3 "Picking"
-	Quit:Status=12 "Geannuleerd"
-	Quit:Status=14 "Afgewerkt"
-	Quit "??? " _ Status
-]]></Implementation>
-</Method>
-
-<Method name="GeefStatus">
-<FormalSpec>CONSNr:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim PickID as %String =..GeefOBJTPickID(CONSNr)
-	Quit:PickID="" ""
-	
-    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
-	#dim Status as %String = ""
-    #dim SqlStatement as %String = "Select OUTBOUNDSTATUS FROM [OBJT_OUTBOUNDORDER] WHERE ID=?"
-    
-    try
-    {
-    	Do res.Prepare(SqlStatement,,OBJTConnection)
-	    Do res.Execute(PickID)    
-    } catch {
-	    do OBJTConnection.Disconnect()
-	    do ##class(TECH.ExceptionHandler).Rethrow()
-    }
-    If res.Next()
-    {
-	    Set Status=$G(res.Data("OUTBOUNDSTATUS"))
-    }
-    do OBJTConnection.Disconnect()
-
-    Quit Status
-]]></Implementation>
-</Method>
-
-<Method name="GeefOBJTPickID">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>CONSNr:%String</FormalSpec>
-<Implementation><![CDATA[
-	Quit:'($D(^ORDW("D",CONSNr))#10) ""
-	#dim JaarMaand as %String = $$EXTDATE^vhLib.DataTypes(+$P(^ORDW("D",CONSNr),"\",18),"DM") ; geeft YY-MM
-	#dim OBJTPickID as %String = $E($TR(JaarMaand,"-")_"9999",1,4)_CONSNr ; voor uniciteit op lange termijn wordt YYMM toegevoegd
-	Quit OBJTPickID
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml
===================================================================
diff -u -r67348 -r67356
--- OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 67348)
+++ OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml	(.../PrintKlantEtiket.cls.xml)	(revision 67356)
@@ -5,16 +5,23 @@
 
 <Property name="VertrekplaatsConverteerder">
 <Type>OBJTimpl.WMSOrder.VertrekplaatsConverteerder</Type>
+<Private>1</Private>
 </Property>
 
+<Property name="PickerUserIdOphaler">
+<Type>OBJTimpl.WMSOrder.OphalenUserIdPickerVanLPN</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>VertrekplaatsConverteerder:OBJTimpl.WMSOrder.VertrekplaatsConverteerder=""</FormalSpec>
+<FormalSpec>VertrekplaatsConverteerder:OBJTimpl.WMSOrder.VertrekplaatsConverteerder="",PickerUserIdOphaler:OBJTimpl.WMSOrder.OphalenUserIdPickerVanLPN</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..VertrekplaatsConverteerder = $$$Inject(VertrekplaatsConverteerder, ##class(OBJTimpl.WMSOrder.VertrekplaatsConverteerder).%New())
+	Set ..PickerUserIdOphaler = $$$Inject(PickerUserIdOphaler, ##class(OBJTimpl.WMSOrder.OphalenUserIdPickerVanLPN).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -27,7 +34,6 @@
 	Set Req.Vertrekplaats="HAL1.1PICK"
 	Set Req.ConsNr="2203378576"
 	Set Req.LPN="D-0011155"
-	Set Req.UserIdPicker = "JoW"
 	Do ..PrintKlantEtiket(Req)
 ]]></Implementation>
 </Method>
@@ -37,7 +43,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Do ..StoreLPN(KlantEtiketRequest)
-	Do EXTERN^FLOWBON4($e(KlantEtiketRequest.ConsNr,5,10), ..ConverteerVertrekplaats(KlantEtiketRequest.Vertrekplaats),KlantEtiketRequest.LPN,KlantEtiketRequest.UserIdPicker)
+	#Dim PickerUserId = ..PickerUserIdOphaler.GeefUserIdPickerVanLPN(KlantEtiketRequest.ConsNr,KlantEtiketRequest.LPN)
+	Do EXTERN^FLOWBON4($e(KlantEtiketRequest.ConsNr,5,10), ..ConverteerVertrekplaats(KlantEtiketRequest.Vertrekplaats),KlantEtiketRequest.LPN,PickerUserId)
 	Quit "OK"
 ]]></Implementation>
 </Method>