Index: OBJTimpl/WMSOrder/ImporteerPicking.cls.xml
===================================================================
diff -u -r68334 -r68783
--- OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 68334)
+++ OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 68783)
@@ -29,8 +29,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderOphaler">
+<Type>OBJTimpl.WMSOrder.OphalenOrderInOBJT</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>PickLijnenOphaler:OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie=""</FormalSpec>
+<FormalSpec>PickLijnenOphaler:OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie="",OrderOphaler:OBJTimpl.WMSOrder.OphalenOrderInOBJT=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -39,6 +44,7 @@
 	Do ##class(dtoCorrelateVoorraadNiveau).%KillExtent()
 	Set ..CheckOBJTFase=##class(OBJTimpl.CheckObjectiveFase).%New()
 	set ..PickLijnenOphaler = $$$Inject(PickLijnenOphaler,##class(OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie).%New())
+	Set ..OrderOphaler = $$$Inject(OrderOphaler,##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New())
 
 	Quit $$$OK
 ]]></Implementation>
@@ -126,18 +132,31 @@
 <Implementation><![CDATA[
 	// er van uitgaande dat er maar één consolidatie in de PickLijst zit
 	#dim ConsolidatieNr as %String = PickLijst.PickLijnen.GetAt(1).ConsNr
+
 	Quit:ConsolidatieNr?1"HK"1.E  ; Herbevoorrading Kardex
 
-	#dim PickLijnIterator as TECH.ResultSetIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
+	#dim Geannuleerd as %Boolean = ##class(TECH.StringUtils).Equals(..OrderOphaler.GeefStatusVertaald(ConsolidatieNr) , "Geannuleerd","Niet in OBJT")
+
+	If Geannuleerd {
+		#dim PickLijnIterator as TECH.ResultSetIterator = ..PickLijnenOphaler.GeefIteratorGeannuleerdOrderAdmin(ConsolidatieNr)
+	} else {
+		Set PickLijnIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
+	}
+
 	#dim AantalPerOrderLijn as %CacheString
 	K AantalPerOrderLijn
+
 	While PickLijnIterator.HasNext()
 	{
 		Set ..rsPicking=PickLijnIterator.Next()
 		Set AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = $Get(AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")),0) + 1
 	}
 	
-	Set PickLijnIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
+	If Geannuleerd {
+		Set PickLijnIterator = ..PickLijnenOphaler.GeefIteratorGeannuleerdOrderAdmin(ConsolidatieNr)
+	} else {
+		Set PickLijnIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
+	}
 	
 	#dim CountPerOrderLijn as %CacheString
 	k CountPerOrderLijn
@@ -148,7 +167,7 @@
 		#dim Full as %Boolean = (CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")))
 		Do ..VerwerkPicking(Full,CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR"))-1)
 	}
-	Do ..VerwerkEinde()
+	Do ..VerwerkEinde(Geannuleerd)
 ]]></Implementation>
 </Method>
 
@@ -157,13 +176,7 @@
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Set ..CONSNr = $E(..rsPicking.GetDataByName("CONSNR"),5,10) ; YYMM moet erafgehaald worden
-		
-	// Alleen in de eerste fase moet er een etiket afgedrukt worden
-	/*
-	If (..CONSNr="")&&(..pxPicking.ConsNr)&&(..CheckOBJTFase.GeefFase()=1) {
-		Do EXTERN^FLOWBON4(..pxPicking.ConsNr, "KARDEX") ; zo snel mogelijk het label printen
-	}
-	*/
+
 	#dim Delimiter as %String = $Select((..rsPicking.GetDataByName("LIJNNR")[";"):";",1:", ")
 	
 	Kill C
@@ -201,6 +214,7 @@
 </Method>
 
 <Method name="VerwerkEinde">
+<FormalSpec>Annulatie:%Boolean=0</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Kill C
@@ -210,7 +224,7 @@
 	Set C("SOFTV")="V"
 	Set C("CONSNR")=..CONSNr
 	Set C("DATUM")=$H
-    Set C("STATUS")="POK"
+    Set C("STATUS")=$Select(Annulatie:"PNOK",1:"POK")
 
 	Do ##class(vhLib.OldSchool).InitVars()
  	Do ##class(vhLib.Logger).%New("OBJT_WMS").Info("Pick einde",$$ArrayToText^vhLib("C",.C)) 
Index: OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml
===================================================================
diff -u -r67799 -r68783
--- OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 67799)
+++ OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 68783)
@@ -64,6 +64,7 @@
 
 <Method name="GeefIterator">
 <FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<ReturnType>TECH.ResultSetIterator</ReturnType>
 <Implementation><![CDATA[
 	#Dim ResultSet as %ResultSet = ..GeefResultSet(ConsolidatieNr)
 	Set Iterator=##class(TECH.ResultSetIterator).%New(ResultSet)
@@ -80,25 +81,7 @@
     #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
-   	Set SqlStatement = "select top 1 orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.NAME IDENTNR, fromloc.FULLNAME FROMLOC,isnull(fromcont.LPN,fromloc.FULLNAME) BRONPALLET ,toloc.FULLNAME TOLOC,tocont.LPN DOELPALLET"
-	_ " ,iif(pa.STATUS is null,null,isnull(emp.ID,'Kardexoperator')) USERID ,pa.DTSSTART PICKINGTIJDSTIP"
-	_ " ,orders.status,olines.Status orderlstatus,po.STATUS pickostatus,pl.STATUS picklstatus,pa.STATUS pickactstatus, pa.DTSSTOP"
-	_ " from DCEREPORT_OUTBOUNDORDERS orders"
-	_ " inner join DCEREPORT_OUTBOUNDLINES    olines on olines.OUTBOUNDORDER_OID = orders.oid"
-	_ " inner join DCEREPORT_PICKORDERS       po on po.ORDER_OID = orders.OID"
-	_ " inner join DCEREPORT_PICKLINES        pl on pl.ORDER_OID = olines.OUTBOUNDORDER_OID and pl.ORDERLINE_OID = olines.oid and pl.PICKORDER_OID = po.oid "
-	_ " left join DCEREPORT_PICK_ACTUALS      pa on pa.PICKORDER_OID = pl.PICKORDER_OID and pa.PICKLINE_OID = pl.OID"
-	_ " left join DCEREPORT_CONTAINERS        fromcont on fromcont.OID = pa.FROM_CONTAINER_OID"
-	_ " left join DCEREPORT_CONTAINERS        tocont on tocont.OID = pa.TO_CONTAINER_OID"
-	_ " left join DCEREPORT_LOCATIONS         fromloc on fromloc.OID= pa.FROM_LOCATION_OID"
-	_ " left join DCEREPORT_LOCATIONS         toloc on toloc.OID= pa.TO_LOCATION_OID"
-	_ " left join DCEREPORT_ITEMS             item on item.OID = pa.ITEM_OID"
-	_ " left join DCEREPORT_EMPLOYEES         emp on emp.OID = pa.EMPLOYEE_OID"
-	_ " where "
-	_ " orders.Status= 14 and"
-	_ " orders.ID= ? "
-	_ " order by olines.name"
-	
+   	
 	Set SqlStatement = "select distinct orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.id IDENTNR "
 	_" ,isnull((select top 1 fl.FULLNAME from DCEREPORT_PICK_ACTUALS p1 "
 	_"         left join DCEREPORT_LOCATIONS         fl on fl.OID= p1.FROM_LOCATION_OID "
@@ -142,6 +125,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIteratorGeannuleerdOrderAdmin">
+<FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<ReturnType>TECH.ResultSetIterator</ReturnType>
+<Implementation><![CDATA[
+	#dim QueryAPI as TECH.Query.QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
+	#dim SqlStatement as %String = ""
+	Set SqlStatement = "select h.OBJTOutboundorderID as CONSNR, s.OBJTOutboundOrderlijnid as LIJNNR ,l.aantalgevraagd as QTYTARGET, 0 as AANTAL,s.Product->IdentNummer as IDENTNR, " 
+    _ " 'annulatie' as FROMLOC ,'annulatie' as BRONPALLET ,'annulatie' as  AFZETLOC ,'annulatie' as DOELPALLET , '' as USERID  ,"
+	_ " current_timestamp as PICKINGTIJDSTIP ,'annulatie' as TOLOC "
+	_ " from Flow_OrderWMS.lijn l "
+	_ " join flow_orderwms.sub s on s.lijn = l.id and s.verwerkingsoftware = 'V' "
+	_ " join flow_orderwms.Hoofding h on l.hoofding = h.id "
+	_ " where  h.OBJTOutboundorderID = ? "
+	
+	Set Query = ##class(TECH.DynamicQuery).%New(SqlStatement,$ListBuild(ConsolidatieNr))
+	#dim ResultSet As TECH.ResultSet = QueryAPI.GetResultSet(Query)
+	
+	Set Iterator=##class(TECH.ResultSetIterator).%New(ResultSet)
+	
+	Quit Iterator
+]]></Implementation>
+</Method>
+
 <Method name="GeefSQLConnectie">
 <Private>1</Private>
 <ReturnType>%SQLGatewayConnection</ReturnType>